Changeset 561 for trunk/projects.pro

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• projects.pro (modified) (6 diffs)

trunk/projects.pro

@@ -9 +9 @@
 
 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
+       QT_BUILD_PARTS = translations $$QT_BUILD_PARTS
+   }
    contains(QT_BUILD_PARTS, tools) {
        QT_BUILD_PARTS -= tools
@@ -38 +46 @@
        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 {
+          !wince*:!symbian:SUBDIRS += tools/linguist/lrelease
+       }
+       SUBDIRS += translations                    # qm build step
     } else:isEqual(PROJECT, qmake) {
        SUBDIRS += qmake
@@ -46 +59 @@
 }
 
-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); \
@@ -62 +75 @@
                         (cd config.tests/unix/nis && $(MAKE) distclean); \
                         (cd config.tests/unix/nix && $(MAKE) distclean); \
+                        (cd config.tests/unix/iodbc && $(MAKE) distclean); \
                         (cd config.tests/unix/odbc && $(MAKE) distclean); \
                         (cd config.tests/unix/oci && $(MAKE) distclean); \
@@ -96 +110 @@
                         -$(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
@@ -136 +163 @@
 }
 
-!win32:contains(QT_CONFIG, qtusagereporter) {
-    usagereporter.path=$$[QT_INSTALL_BINS]
-    usagereporter.files=$$QT_BUILD_TREE/bin/qtusagereporter
-    INSTALLS += usagereporter
-}