diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
tree | 9981f274712c098cabbff0c4667672a3934e5393 /src/gui/gui.pro | |
parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'src/gui/gui.pro')
-rw-r--r-- | src/gui/gui.pro | 43 |
1 files changed, 2 insertions, 41 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 58e1d6c45f..4ee9d764ec 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -8,10 +8,6 @@ CONFIG += module MODULE_PRI = ../modules/qt_gui.pri DEFINES += QT_BUILD_GUI_LIB QT_NO_USING_NAMESPACE -win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000 -irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused - -!win32:!embedded:!qpa:!mac:!symbian:CONFIG += x11 unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore @@ -19,54 +15,19 @@ load(qt_module_config) HEADERS += $$QT_SOURCE_TREE/src/gui/qtguiversion.h -contains(QT_CONFIG, x11sm):CONFIG += x11sm - -#platforms -x11:include(kernel/x11.pri) -mac:include(kernel/mac.pri) -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) -include(styles/styles.pri) -include(widgets/widgets.pri) -include(dialogs/dialogs.pri) -include(accessible/accessible.pri) -include(itemviews/itemviews.pri) -include(inputmethod/inputmethod.pri) -include(graphicsview/graphicsview.pri) +include(painting/painting.pri) include(util/util.pri) -include(statemachine/statemachine.pri) include(math3d/math3d.pri) -include(effects/effects.pri) +include(opengl/opengl.pri) include(egl/egl.pri) -win32:!wince*: DEFINES += QT_NO_EGL -embedded: QT += network QMAKE_LIBS += $$QMAKE_LIBS_GUI -contains(DEFINES,QT_EVAL):include($$QT_SOURCE_TREE/src/corelib/eval.pri) - -QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtGui.dynlist - DEFINES += Q_INTERNAL_QAPP_SRC -symbian { - TARGET.UID3=0x2001B2DD - - # ro-section in gui can exceed default allocated space, so move rw-section a little further - QMAKE_LFLAGS.ARMCC += --rw-base 0x800000 - QMAKE_LFLAGS.GCCE += -Tdata 0x800000 -} neon:*-g++* { DEFINES += QT_HAVE_NEON |