Merge remote branch 'gerrit/master' into refactor
[profile/ivi/qtbase.git] / sync.profile
index c8e113b..6d88ced 100644 (file)
@@ -1,7 +1,7 @@
 %modules = ( # path to module name map
     "QtGui" => "$basedir/src/gui",
+    "QtWidgets" => "$basedir/src/widgets",
     "QtOpenGL" => "$basedir/src/opengl",
-    "QtOpenVG" => "$basedir/src/openvg",
     "QtCore" => "$basedir/src/corelib",
     "QtXml" => "$basedir/src/xml",
     "QtSql" => "$basedir/src/sql",
@@ -10,6 +10,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
 );
@@ -41,9 +42,9 @@
 %mastercontent = (
     "core" => "#include <QtCore/QtCore>\n",
     "gui" => "#include <QtGui/QtGui>\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",
     "QtCore" => "$basedir/src/modules/qt_core.pri",
     "QtDBus" => "$basedir/src/modules/qt_dbus.pri",
     "QtGui" => "$basedir/src/modules/qt_gui.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",
     "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" );