diff options
Diffstat (limited to 'projects.pro')
| -rw-r--r-- | projects.pro | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/projects.pro b/projects.pro index 953eae829..497acd0fb 100644 --- a/projects.pro +++ b/projects.pro @@ -8,7 +8,11 @@ TEMPLATE = subdirs cross_compile: CONFIG += nostrip isEmpty(QT_BUILD_PARTS) { #defaults - QT_BUILD_PARTS = libs tools examples demos docs translations + symbian { + QT_BUILD_PARTS = libs tools examples demos + } else { + QT_BUILD_PARTS = libs tools examples demos docs translations + } } else { #make sure the order makes sense contains(QT_BUILD_PARTS, translations) { QT_BUILD_PARTS -= translations @@ -41,7 +45,12 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) { } else:isEqual(PROJECT, docs) { contains(QT_BUILD_PARTS, tools):include(doc/doc.pri) } else:isEqual(PROJECT, translations) { - contains(QT_BUILD_PARTS, tools):include(translations/translations.pri) + contains(QT_BUILD_PARTS, tools) { + include(translations/translations.pri) # ts targets + } else { + SUBDIRS += tools/linguist/lrelease + } + SUBDIRS += translations # qm build step } else:isEqual(PROJECT, qmake) { # SUBDIRS += qmake } else { @@ -49,9 +58,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 +110,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 +162,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 -} |