4 files changed, 1 insertions, 7 deletions
diff --git a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp index 6712870..2ee4a65 100644 --- a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp +++ b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp | |||
@@ -25,9 +25,8 @@ int main( int argc, char** argv ) | |||
25 | // can't delete the app when using the OConfigGroupSaver on top level scope, | 25 | // can't delete the app when using the OConfigGroupSaver on top level scope, |
26 | // because the destructor of the OConfigGroupSaver needs an application object | 26 | // because the destructor of the OConfigGroupSaver needs an application object |
27 | //delete app; // destructor deletes config which writes changes back to disk | 27 | //delete app; // destructor deletes config which writes changes back to disk |
28 | 28 | ||
29 | return 0; | 29 | return 0; |
30 | 30 | ||
31 | } | 31 | } |
32 | 32 | ||
33 | //#include "moc/oconfigdemo.moc" | ||
diff --git a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro index 9721e99..b29c106 100644 --- a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro +++ b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro | |||
@@ -2,18 +2,16 @@ TEMPLATE = app | |||
2 | CONFIG = qt warn_on | 2 | CONFIG = qt warn_on |
3 | HEADERS = | 3 | HEADERS = |
4 | SOURCES = oconfigdemo.cpp | 4 | SOURCES = oconfigdemo.cpp |
5 | 5 | ||
6 | INCLUDEPATH += $(OPIEDIR)/include | 6 | INCLUDEPATH += $(OPIEDIR)/include |
7 | DEPENDPATH += $(OPIEDIR)/include | 7 | DEPENDPATH += $(OPIEDIR)/include |
8 | LIBS += -lopiecore2 | 8 | LIBS += -lopiecore2 |
9 | TARGET = oconfigdemo | 9 | TARGET = oconfigdemo |
10 | MOC_DIR = moc | ||
11 | OBJECTS_DIR = obj | ||
12 | 10 | ||
13 | !contains( platform, x11 ) { | 11 | !contains( platform, x11 ) { |
14 | include( $(OPIEDIR)/include.pro ) | 12 | include( $(OPIEDIR)/include.pro ) |
15 | } | 13 | } |
16 | 14 | ||
17 | contains( platform, x11 ) { | 15 | contains( platform, x11 ) { |
18 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 16 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
19 | } | 17 | } |
diff --git a/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp b/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp index c0369ef..b046d28 100644 --- a/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp +++ b/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp | |||
@@ -134,9 +134,9 @@ int main( int argc, char** argv ) | |||
134 | { | 134 | { |
135 | DemoApp* app = new DemoApp( argc, argv ); | 135 | DemoApp* app = new DemoApp( argc, argv ); |
136 | app->exec(); | 136 | app->exec(); |
137 | 137 | ||
138 | return 0; | 138 | return 0; |
139 | 139 | ||
140 | } | 140 | } |
141 | 141 | ||
142 | #include "moc/odebugdemo.moc" | 142 | #include "odebugdemo.moc" |
diff --git a/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro b/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro index 781d678..e06053c 100644 --- a/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro +++ b/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro | |||
@@ -2,19 +2,16 @@ TEMPLATE = app | |||
2 | CONFIG = qt warn_on | 2 | CONFIG = qt warn_on |
3 | HEADERS = | 3 | HEADERS = |
4 | SOURCES = odebugdemo.cpp | 4 | SOURCES = odebugdemo.cpp |
5 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
6 | DEPENDPATH += $(OPIEDIR)/include | 6 | DEPENDPATH += $(OPIEDIR)/include |
7 | LIBS += -lopiecore2 | 7 | LIBS += -lopiecore2 |
8 | TARGET = odebugdemo | 8 | TARGET = odebugdemo |
9 | 9 | ||
10 | OBJECTS_DIR = obj | ||
11 | |||
12 | !contains( platform, x11 ) { | 10 | !contains( platform, x11 ) { |
13 | include( $(OPIEDIR)/include.pro ) | 11 | include( $(OPIEDIR)/include.pro ) |
14 | } | 12 | } |
15 | 13 | ||
16 | contains( platform, x11 ) { | 14 | contains( platform, x11 ) { |
17 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 15 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
18 | } | 16 | } |
19 | 17 | ||
20 | MOC_DIR = moc | ||