summaryrefslogtreecommitdiff
authorzecke <zecke>2005-01-23 20:21:35 (UTC)
committer zecke <zecke>2005-01-23 20:21:35 (UTC)
commit8f2fbef1de1b3803a21d51752fee1014c951cc12 (patch) (side-by-side diff)
tree9289dbe83d2f25af0e95adcad7e3e230920a9b12
parentda166ce6066568db9b7ac0bf5c2cc0dc9afb0776 (diff)
downloadopie-8f2fbef1de1b3803a21d51752fee1014c951cc12.zip
opie-8f2fbef1de1b3803a21d51752fee1014c951cc12.tar.gz
opie-8f2fbef1de1b3803a21d51752fee1014c951cc12.tar.bz2
-Use the global directory for .obj and .moc
-Include the foo.moc to work better The problem just came up yesterday
Diffstat (more/less context) (ignore 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
@@ -9,25 +9,24 @@ int main( int argc, char** argv )
OApplication* app = new OApplication( argc, argv, "MyConfigDemoApplication" );
OConfigGroupSaver c1( app->config(), "MyGroup" );
app->config()->writeEntry( "AnEntry", "InMyGroup" );
{
OConfigGroupSaver c2( c1.config(), "AnotherGroup" );
app->config()->writeEntry( "AnEntry", "InAnotherGroup" );
} // closing the scope returns to the last group
app->config()->writeEntry( "AnotherEntry", "InMyGroup" );
// do more stuff ...
// in this (special) case it is necessary to manually call OConfig::write() (see below)
app->config()->write();
// can't delete the app when using the OConfigGroupSaver on top level scope,
// because the destructor of the OConfigGroupSaver needs an application object
//delete app; // destructor deletes config which writes changes back to disk
return 0;
}
-//#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
@@ -1,20 +1,18 @@
TEMPLATE = app
CONFIG = qt warn_on
HEADERS =
SOURCES = oconfigdemo.cpp
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lopiecore2
TARGET = oconfigdemo
-MOC_DIR = moc
-OBJECTS_DIR = obj
!contains( platform, x11 ) {
include( $(OPIEDIR)/include.pro )
}
contains( platform, x11 ) {
LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
}
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
@@ -118,25 +118,25 @@ public slots:
void emitFatalOutput()
{
ofatal << "This is a fatal message" << oendl;
}
void emitTBOutput()
{
ofatal << "This is a fatal message + backtrace\n" + odBacktrace(); // odBacktrace includes \n
}
private:
QButtonGroup* g;
int m;
QLineEdit* e;
};
int main( int argc, char** argv )
{
DemoApp* app = new DemoApp( argc, argv );
app->exec();
return 0;
}
-#include "moc/odebugdemo.moc"
+#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
@@ -1,20 +1,17 @@
TEMPLATE = app
CONFIG = qt warn_on
HEADERS =
SOURCES = odebugdemo.cpp
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lopiecore2
TARGET = odebugdemo
-OBJECTS_DIR = obj
-
!contains( platform, x11 ) {
include( $(OPIEDIR)/include.pro )
}
contains( platform, x11 ) {
LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
}
-MOC_DIR = moc