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

trunk/src/gui/gui.pro

@@ -5 +5 @@
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000
 
-!win32:!os2:!embedded:!mac:CONFIG      += x11
+!win32:!embedded:!mac:!symbian:!os2::CONFIG      += x11
 
 unix:QMAKE_PKGCONFIG_REQUIRES = QtCore
@@ -14 +14 @@
 
 # On OS/2, the debug DLL is too big and links slowly, split it to 3 pieces
-os2:dll:splitDllBegin(. A B, debug, debug|release)
+os2:dll:splitDllBegin(. A B C, debug, debug|release)
 
 #platforms
@@ -21 +21 @@
 win32:include(kernel/win.pri)
 embedded:include(embedded/embedded.pri)
+symbian {
+    include(kernel/symbian.pri)
+    include(s60framework/s60framework.pri)
+}
 
 #modules
+include(animation/animation.pri)
 include(kernel/kernel.pri)
 include(image/image.pri)
 include(painting/painting.pri)
 include(text/text.pri)
+
 os2:dll:splitDllPart(.)
+
 include(styles/styles.pri)
 include(widgets/widgets.pri)
+
 os2:dll:splitDllPart(A)
+
 include(dialogs/dialogs.pri)
 include(accessible/accessible.pri)
@@ -37 +46 @@
 include(graphicsview/graphicsview.pri)
 include(util/util.pri)
+
 os2:dll:splitDllPart(B)
+
+include(statemachine/statemachine.pri)
+include(math3d/math3d.pri)
+include(effects/effects.pri)
+
+contains(QT_CONFIG, egl): include(egl/egl.pri)
+
+os2:dll:splitDllPart(C)
 
 os2:dll:splitDllEnd()
@@ -50 +68 @@
 
 DEFINES += Q_INTERNAL_QAPP_SRC
+symbian:TARGET.UID3=0x2001B2DD
 
+# ro-section in gui can exceed default allocated space, so more rw-section little further
+symbian-sbsv2: QMAKE_LFLAGS.ARMCC += --rw-base 0x800000"