diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-25 23:06:36 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-25 23:06:36 (GMT) |
| commit | 8484fc497f9d02b708cb23adb8ab6102d63a7753 (patch) | |
| tree | eb6aacda7fda551bcfbcfd6b0d192b2389bd094e /projects.pro | |
| parent | 314c6ec54e4cb4e2ec936ada7e0a112a60b87832 (diff) | |
| parent | 1470504e15662acf37bacc58359527f88efc43ab (diff) | |
| download | Qt-8484fc497f9d02b708cb23adb8ab6102d63a7753.zip Qt-8484fc497f9d02b708cb23adb8ab6102d63a7753.tar.gz Qt-8484fc497f9d02b708cb23adb8ab6102d63a7753.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure
configure.exe
mkspecs/features/qt.prf
tools/configure/configureapp.cpp
Diffstat (limited to 'projects.pro')
| -rw-r--r-- | projects.pro | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/projects.pro b/projects.pro index 953eae8..2a6a956 100644 --- a/projects.pro +++ b/projects.pro @@ -28,6 +28,10 @@ isEmpty(QT_BUILD_PARTS) { #defaults } } +symbian { + QT_BUILD_PARTS = libs tools examples demos +} + #process the projects for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) { isEqual(PROJECT, tools) { @@ -49,9 +53,9 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) { } } -confclean.depends += clean +!symbian: confclean.depends += clean confclean.commands = -unix { +unix:!symbian { confclean.commands += (cd config.tests/unix/stl && $(MAKE) distclean); \ (cd config.tests/unix/endian && $(MAKE) distclean); \ (cd config.tests/unix/ipv6 && $(MAKE) distclean); \ @@ -101,6 +105,19 @@ win32 { -$(DEL_FILE) .qmake.cache $$escape_expand(\n\t) \ (cd qmake && $(MAKE) distclean) } +symbian { + confclean.depends += distclean + confclean.commands += \ + (cd src\tools\moc && $(MAKE) distclean) $$escape_expand(\n\t) \ + (cd src\tools\rcc && $(MAKE) distclean) $$escape_expand(\n\t) \ + (cd src\tools\uic && $(MAKE) distclean) $$escape_expand(\n\t) \ + -$(DEL_FILE) src\corelib\global\qconfig.h $$escape_expand(\n\t) \ + -$(DEL_FILE) src\corelib\global\qconfig.cpp $$escape_expand(\n\t) \ + -$(DEL_FILE) mkspecs\qconfig.pri $$escape_expand(\n\t) \ + -$(DEL_FILE) .qmake.cache $$escape_expand(\n\t) \ + (cd qmake && $(MAKE) distclean) + +} QMAKE_EXTRA_TARGETS += confclean qmakeclean.commands += (cd qmake && $(MAKE) clean) QMAKE_EXTRA_TARGETS += qmakeclean @@ -140,8 +157,3 @@ false:macx { #mac install location INSTALLS += macdocs } -!win32:contains(QT_CONFIG, qtusagereporter) { - usagereporter.path=$$[QT_INSTALL_BINS] - usagereporter.files=$$QT_BUILD_TREE/bin/qtusagereporter - INSTALLS += usagereporter -} |