Changeset 846 for trunk/tools/tools.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)
• tools/tools.pro (modified) (3 diffs)

trunk/tools/tools.pro

@@ -1 +1 @@
 TEMPLATE        = subdirs
 
-no-png {
-    message("Some graphics-related tools are unavailable without PNG support")
-} else {
-     SUBDIRS += assistant \
-                pixeltool \
-                porting \
-                qtestlib \
-                qttracereplay
-     contains(QT_EDITION, Console) {
-         SUBDIRS += designer/src/uitools     # Linguist depends on this
-     } else {
-         SUBDIRS += designer
-     }
-     SUBDIRS     += linguist
-     symbian: SUBDIRS = designer
-     wince*: SUBDIRS = qtestlib designer
-     unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
-     win32:!wince*:SUBDIRS += activeqt
+!contains(QT_CONFIG, no-gui) {
+    no-png {
+        message("Some graphics-related tools are unavailable without PNG support")
+    } else {
+        symbian {
+            SUBDIRS = designer
+        } else:wince* {
+            SUBDIRS = qtestlib designer
+        } else {
+            SUBDIRS = assistant \
+                      pixeltool \
+                      porting \
+                      qtestlib \
+                      qttracereplay
+            contains(QT_EDITION, Console) {
+                SUBDIRS += designer/src/uitools     # Linguist depends on this
+            } else {
+                SUBDIRS += designer
+            }
+        }
+        unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
+        win32:!wince*:SUBDIRS += activeqt
+    }
+    contains(QT_CONFIG, declarative):SUBDIRS += qml
 }
+
+
 
 mac {
@@ -27 +35 @@
 embedded:SUBDIRS += kmap2qmap
 
-contains(QT_CONFIG, declarative):SUBDIRS += qmlviewer qmldebugger
 contains(QT_CONFIG, dbus):SUBDIRS += qdbus
 # We don't need these command line utilities on embedded platforms.
@@ -37 +44 @@
 CONFIG+=ordered
 QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)"
+
+
+
+