Changeset 846 for trunk/projects.pro

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

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

trunk/projects.pro

@@ -49 +49 @@
           include(translations/translations.pri)  # ts targets
        } else {
-          !wince*:!symbian:SUBDIRS += tools/linguist/lrelease
+          !wince*:SUBDIRS += tools/linguist/lrelease
        }
        SUBDIRS += translations                    # qm build step
@@ -105 +105 @@
 }
 win32|os2 {
-  confclean.commands += -$(DEL_FILE) src\core\global\qconfig.h $$escape_expand(\n\t) \
-                        -$(DEL_FILE) src\core\global\qconfig.cpp $$escape_expand(\n\t) \
-                        -$(DEL_FILE) mkspecs\qconfig.pri $$escape_expand(\n\t) \
-                        -$(DEL_FILE) .qmake.cache $$escape_expand(\n\t) \
+  confclean.commands += -$(DEL_FILE) src\\core\\global\\qconfig.h $$escape_expand(\\n\\t) \
+                        -$(DEL_FILE) src\\core\\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)
 }
 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) \
+  contains(QMAKE_HOST.os, "Windows") {
+    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)
-            
+  } else {
+    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
@@ -149 +160 @@
 #mkspecs
 mkspecs.path=$$[QT_INSTALL_DATA]/mkspecs
-mkspecs.files=$$QT_BUILD_TREE/mkspecs/qconfig.pri $$QT_SOURCE_TREE/mkspecs/*
+mkspecs.files=$$QT_BUILD_TREE/mkspecs/qconfig.pri $$files($$QT_SOURCE_TREE/mkspecs/*)
+mkspecs.files -= $$QT_SOURCE_TREE/mkspecs/modules
 unix { 
    DEFAULT_QMAKESPEC = $$QMAKESPEC
    DEFAULT_QMAKESPEC ~= s,^.*mkspecs/,,g
    mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default; $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default
+   mkspecs.files -= $$QT_SOURCE_TREE/mkspecs/default
 }
 win32:!equals(QT_BUILD_TREE, $$QT_SOURCE_TREE) {