diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-03-04 10:47:45 (GMT) |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-03-04 11:26:06 (GMT) |
| commit | 8c8e9ffb60c244462f615f510bc71d4010cf8faf (patch) | |
| tree | 7f960a8800ba2d2599450d04883af762d3cdb47f | |
| parent | 4574b342ebb8800ba50ca23f154c20b3e8a239af (diff) | |
| download | Qt-8c8e9ffb60c244462f615f510bc71d4010cf8faf.zip Qt-8c8e9ffb60c244462f615f510bc71d4010cf8faf.tar.gz Qt-8c8e9ffb60c244462f615f510bc71d4010cf8faf.tar.bz2 | |
Remove the OBJECTS_DIR variable assignment from some projets in Qt.
This prevent debug and release object file to be mixed up when
linking these application in a debug_and_release configured Qt.
Reviewed-by: Marius Storm-Olsen
| -rw-r--r-- | demos/qtdemo/qtdemo.pro | 2 | ||||
| -rw-r--r-- | examples/threads/waitconditions/waitconditions.pro | 2 | ||||
| -rw-r--r-- | src/tools/moc/util/generate_keywords.pro | 1 | ||||
| -rw-r--r-- | tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro | 5 | ||||
| -rw-r--r-- | tools/qev/qev.pro | 2 |
5 files changed, 0 insertions, 12 deletions
diff --git a/demos/qtdemo/qtdemo.pro b/demos/qtdemo/qtdemo.pro index 011ea0c..2a776ac 100644 --- a/demos/qtdemo/qtdemo.pro +++ b/demos/qtdemo/qtdemo.pro @@ -3,8 +3,6 @@ TARGET = qtdemo DEMO_DESTDIR = $$QT_BUILD_TREE isEmpty(DEMO_DESTDIR):DEMO_DESTDIR=../.. DESTDIR = $$DEMO_DESTDIR/bin -OBJECTS_DIR = .obj -MOC_DIR = .moc INSTALLS += target sources diff --git a/examples/threads/waitconditions/waitconditions.pro b/examples/threads/waitconditions/waitconditions.pro index b07b413..c2be6cd 100644 --- a/examples/threads/waitconditions/waitconditions.pro +++ b/examples/threads/waitconditions/waitconditions.pro @@ -10,8 +10,6 @@ INCLUDEPATH += . # Input SOURCES += waitconditions.cpp CONFIG += qt warn_on create_prl link_prl console -OBJECTS_DIR=obj/debug-shared -MOC_DIR=moc/debug-shared # install target.path = $$[QT_INSTALL_EXAMPLES]/threads/waitconditions diff --git a/src/tools/moc/util/generate_keywords.pro b/src/tools/moc/util/generate_keywords.pro index 8dff744..eb04409 100644 --- a/src/tools/moc/util/generate_keywords.pro +++ b/src/tools/moc/util/generate_keywords.pro @@ -10,4 +10,3 @@ INCLUDEPATH += . # Input SOURCES += generate_keywords.cpp CONFIG += qt create_prl link_prl -OBJECTS_DIR=.obj/debug-shared diff --git a/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro b/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro index 93a03db..e8b1ce9 100644 --- a/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro +++ b/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro @@ -13,8 +13,3 @@ wince*|symbian*:TARGET = ../desktopsettingsaware SOURCES += main.cpp CONFIG += qt warn_on create_prl link_prl CONFIG -= app_bundle - -!symbian*: { -OBJECTS_DIR=.obj/debug-shared -MOC_DIR=.moc/debug-shared -} diff --git a/tools/qev/qev.pro b/tools/qev/qev.pro index 28383c6..962b9fa 100644 --- a/tools/qev/qev.pro +++ b/tools/qev/qev.pro @@ -9,5 +9,3 @@ INCLUDEPATH += . # Input SOURCES += qev.cpp CONFIG += qt warn_on create_prl link_prl -OBJECTS_DIR=.obj/debug-shared -MOC_DIR=.moc/debug-shared |