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

trunk/examples/examples.pro

@@ -1 +1 @@
 TEMPLATE      = subdirs
 SUBDIRS       = \
+
                 desktop \
                 dialogs \
                 draganddrop \
+
                 graphicsview \
                 ipc \
@@ -15 +17 @@
                 richtext \
                 sql \
+
                 threads \
                 tools \
@@ -21 +24 @@
                 uitools \
                 xml \
-                script
+                multitouch \
+                gestures
+
+symbian: SUBDIRS = \
+                graphicsview \
+                itemviews \
+                network \
+                painting \
+                widgets \
+                draganddrop \
+                mainwindows \
+                sql \
+                uitools \
+                xml
+
+contains(QT_CONFIG, multimedia) {
+    SUBDIRS += multimedia
+}
+
+contains(QT_CONFIG, script): SUBDIRS += script
 
 contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon
 contains(QT_CONFIG, webkit): SUBDIRS += webkit
 embedded:SUBDIRS += qws
-!wince*: {
+!wince*: {
         !contains(QT_EDITION, Console):contains(QT_BUILD_PARTS, tools):SUBDIRS += designer
         contains(QT_BUILD_PARTS, tools):SUBDIRS += assistant qtestlib help
@@ -34 +56 @@
 }
 contains(QT_CONFIG, opengl): SUBDIRS += opengl
+
 contains(QT_CONFIG, dbus): SUBDIRS += dbus
-win32:!contains(QT_EDITION, OpenSource|Console):SUBDIRS += activeqt
+win32:SUBDIRS += activeqt
 contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns
 contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows
@@ -43 +66 @@
 sources.path = $$[QT_INSTALL_EXAMPLES]
 INSTALLS += sources
+
+