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

trunk/tools/tools.pro

@@ -7 +7 @@
                 pixeltool \
                 porting \
-                qtestlib
+                qtestlib \
+                qttracereplay
      contains(QT_EDITION, Console) {
          SUBDIRS += designer/src/uitools     # Linguist depends on this
@@ -14 +15 @@
      }
      SUBDIRS     += linguist
+
      wince*: SUBDIRS = qtestlib designer
      unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
-     win32:!wince*:!contains(QT_EDITION, OpenSource|Console):SUBDIRS += activeqt
+     win32:!wince*:SUBDIRS += activeqt
 }
 
@@ -23 +25 @@
 }
 
+
+
+
 contains(QT_CONFIG, dbus):SUBDIRS += qdbus
-!wince*:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns
+!wince*:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns
 embedded: SUBDIRS += makeqpf
+
+
 
 CONFIG+=ordered