summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp1
-rw-r--r--libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro2
-rw-r--r--libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp2
-rw-r--r--libopie2/examples/opiecore/odebugdemo/odebugdemo.pro3
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
@@ -27,7 +27,6 @@ int main( int argc, char** argv )
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
@@ -4,14 +4,12 @@ HEADERS =
4SOURCES = oconfigdemo.cpp 4SOURCES = oconfigdemo.cpp
5 5
6INCLUDEPATH += $(OPIEDIR)/include 6INCLUDEPATH += $(OPIEDIR)/include
7DEPENDPATH += $(OPIEDIR)/include 7DEPENDPATH += $(OPIEDIR)/include
8LIBS += -lopiecore2 8LIBS += -lopiecore2
9TARGET = oconfigdemo 9TARGET = oconfigdemo
10MOC_DIR = moc
11OBJECTS_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
17contains( platform, x11 ) { 15contains( platform, x11 ) {
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
@@ -136,7 +136,7 @@ int main( int argc, char** 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
@@ -4,17 +4,14 @@ HEADERS =
4SOURCES = odebugdemo.cpp 4SOURCES = odebugdemo.cpp
5INCLUDEPATH += $(OPIEDIR)/include 5INCLUDEPATH += $(OPIEDIR)/include
6DEPENDPATH += $(OPIEDIR)/include 6DEPENDPATH += $(OPIEDIR)/include
7LIBS += -lopiecore2 7LIBS += -lopiecore2
8TARGET = odebugdemo 8TARGET = odebugdemo
9 9
10OBJECTS_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
16contains( platform, x11 ) { 14contains( platform, x11 ) {
17 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 15 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
18} 16}
19 17
20MOC_DIR = moc