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 /sync.profile | |
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 'sync.profile')
-rw-r--r-- | sync.profile | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sync.profile b/sync.profile index 3e60295dda..e0d23ac3bf 100644 --- a/sync.profile +++ b/sync.profile @@ -1,7 +1,8 @@ %modules = ( # path to module name map "QtGui" => "$basedir/src/gui", + "QtWidgets" => "$basedir/src/widgets", + "QtPrintSupport" => "$basedir/src/printsupport", "QtOpenGL" => "$basedir/src/opengl", - "QtOpenVG" => "$basedir/src/openvg", "QtCore" => "$basedir/src/corelib", "QtV8" => "$basedir/src/v8", "QtXml" => "$basedir/src/xml", @@ -11,6 +12,7 @@ "QtDBus" => "$basedir/src/dbus", "QtUiTools" => "$basedir/src/uitools", "QtDesigner" => "$basedir/tools/uilib", + "QtPlatformSupport" => "$basedir/src/platformsupport", ); %moduleheaders = ( # restrict the module headers to those found in relative path "QtV8" => "../3rdparty/v8/include", @@ -47,9 +49,10 @@ %mastercontent = ( "core" => "#include <QtCore/QtCore>\n", "gui" => "#include <QtGui/QtGui>\n", + "printsupport" => "#include <QtPrintSupport/QtPrintSupport>\n", + "widgets" => "#include <QtWidgets/QtWidgets>\n", "network" => "#include <QtNetwork/QtNetwork>\n", "opengl" => "#include <QtOpenGL/QtOpenGL>\n", - "openvg" => "#include <QtOpenVG/QtOpenVG>\n", "xml" => "#include <QtXml/QtXml>\n", "uitools" => "#include <QtUiTools/QtUiTools>\n", "designer" => "#include <QtDesigner/QtDesigner>\n", @@ -58,15 +61,17 @@ "QtCore" => "$basedir/src/modules/qt_core.pri", "QtDBus" => "$basedir/src/modules/qt_dbus.pri", "QtGui" => "$basedir/src/modules/qt_gui.pri", + "QtPrintSupport" => "$basedir/src/modules/qt_printsupport.pri", + "QtWidgets" => "$basedir/src/modules/qt_widgets.pri", "QtNetwork" => "$basedir/src/modules/qt_network.pri", "QtOpenGL" => "$basedir/src/modules/qt_opengl.pri", - "QtOpenVG" => "$basedir/src/modules/qt_openvg.pri", "QtSql" => "$basedir/src/modules/qt_sql.pri", "QtTest" => "$basedir/src/modules/qt_testlib.pri", "QtV8" => "$basedir/src/modules/qt_v8.pri", "QtXml" => "$basedir/src/modules/qt_xml.pri", "QtUiTools" => "$basedir/src/modules/qt_uitools.pri", "QtDesigner" => "$basedir/src/modules/qt_uilib.pri", + "QtPlatformSupport" => "$basedir/src/modules/qt_platformsupport.pri", ); @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" ); |