projects / profile / ivi / qtbase.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Entered hardcoded urls QTBUG-28500
[profile/ivi/qtbase.git] / sync.profile
diff --git a/sync.profile b/sync.profile
index 5e17174..dd01df9 100644 (file)
--- a/sync.profile
+++ b/sync.profile
@@ -3,7 +3,7 @@
     "QtWidgets" => "$basedir/src/widgets",
     "QtPrintSupport" => "$basedir/src/printsupport",
     "QtOpenGL" => "$basedir/src/opengl",
-    "QtCore" => "$basedir/src/corelib",
+    "QtCore" => "$basedir/src/corelib;^$basedir/src/3rdparty/harfbuzz/src",
     "QtXml" => "$basedir/src/xml",
     "QtSql" => "$basedir/src/sql",
     "QtNetwork" => "$basedir/src/network",
@@ -11,6 +11,10 @@
     "QtDBus" => "$basedir/src/dbus",
     "QtConcurrent" => "$basedir/src/concurrent",
     "QtPlatformSupport" => "$basedir/src/platformsupport",
+    "KHR" => "$basedir/src/3rdparty/angle/include/KHR",
+    "GLES2" => "$basedir/src/3rdparty/angle/include/GLES2",
+    "EGL" => "$basedir/src/3rdparty/angle/include/EGL",
+    "QtZlib" => "$basedir/src/3rdparty/zlib",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
@@ -26,92 +30,18 @@
     "qdebug.h" => "QtDebug",
     "qevent.h" => "QtEvents",
     "qnamespace.h" => "Qt",
+    "qnumeric.h" => "QtNumeric",
+    "qsql.h" => "QSql",
     "qssl.h" => "QSsl",
     "qtest.h" => "QTest",
     "qtconcurrentmap.h" => "QtConcurrentMap",
     "qtconcurrentfilter.h" => "QtConcurrentFilter",
     "qtconcurrentrun.h" => "QtConcurrentRun",
 );
-%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",
-    "xml" => "#include <QtXml/QtXml>\n",
-    "concurrent" => "#include <QtConcurrent/QtConcurrent>\n",
-);
-%modulepris = (
-    "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",
-    "QtSql" => "$basedir/src/modules/qt_sql.pri",
-    "QtTest" => "$basedir/src/modules/qt_testlib.pri",
-    "QtXml" => "$basedir/src/modules/qt_xml.pri",
-    "QtConcurrent" => "$basedir/src/modules/qt_concurrent.pri",
-    "QtPlatformSupport" => "$basedir/src/modules/qt_platformsupport.pri",
-);
 %deprecatedheaders = (
     "QtGui" =>  {
-        "qplatformaccessibility_qpa.h" => "qpa/qplatformaccessibility.h",
-        "QPlatformAccessibility" => "qpa/qplatformaccessibility.h",
-        "qplatformbackingstore_qpa.h" => "qpa/qplatformbackingstore.h",
-        "QPlatformBackingStore" => "qpa/qplatformbackingstore.h",
-        "qplatformclipboard_qpa.h" => "qpa/qplatformclipboard.h",
-        "QPlatformClipboard" => "qpa/qplatformclipboard.h",
-        "QPlatformColorDialogHelper" => "qpa/qplatformdialoghelper.h",
-        "qplatformcursor_qpa.h" => "qpa/qplatformcursor.h",
-        "QPlatformCursor" => "qpa/qplatformcursor.h",
-        "QPlatformCursorImage" => "qpa/qplatformcursor.h",
-        "QPlatformCursorPrivate" => "qpa/qplatformcursor.h",
-        "qplatformdrag_qpa.h" => "qpa/qplatformdrag.h",
-        "QPlatformDrag" => "qpa/qplatformdrag.h",
-        "QPlatformDragQtResponse" => "qpa/qplatformdrag.h",
-        "QPlatformDropQtResponse" => "qpa/qplatformdrag.h",
-        "qplatformdialoghelper_qpa.h" => "qpa/qplatformdialoghelper.h",
-        "QPlatformDialogHelper" => "qpa/qplatformdialoghelper.h",
-        "QPlatformFileDialogHelper" => "qpa/qplatformdialoghelper.h",
-        "qplatformfontdatabase_qpa.h" => "qpa/qplatformfontdatabase.h",
-        "QPlatformFontDatabase" => "qpa/qplatformfontdatabase.h",
-        "qplatforminputcontext_qpa.h" => "qpa/qplatforminputcontext.h",
-        "QPlatformInputContext" => "qpa/qplatforminputcontext.h",
-        "qplatforminputcontext_qpa_p.h" => "qpa/qplatforminputcontext_p.h",
-        "qplatformintegration_qpa.h" => "qpa/qplatformintegration.h",
-        "QPlatformIntegration" => "qpa/qplatformintegration.h",
-        "qplatformintegrationfactory_qpa_p.h" => "qpa/qplatformintegrationfactory_p.h",
-        "QPlatformIntegrationFactory" => "qpa/qplatformintegrationfactory_p.h",
-        "qplatformintegrationplugin_qpa.h" => "qpa/qplatformintegrationplugin.h",
-        "QPlatformIntegrationPlugin" => "qpa/qplatformintegrationplugin.h",
-        "qplatformnativeinterface_qpa.h" => "qpa/qplatformnativeinterface.h",
-        "QPlatformNativeInterface" => "qpa/qplatformnativeinterface.h",
-        "qplatformopenglcontext_qpa.h" => "qpa/qplatformopenglcontext.h",
-        "QPlatformOpenGLContext" => "qpa/qplatformopenglcontext.h",
-        "qplatformpixmap_qpa.h" => "qpa/qplatformpixmap.h",
-        "QPlatformPixmap" => "qpa/qplatformpixmap.h",
-        "qplatformscreen_qpa.h" => "qpa/qplatformscreen.h",
-        "QPlatformScreen" => "qpa/qplatformscreen.h",
-        "qplatformscreen_qpa_p.h" => "qpa/qplatformscreen_p.h",
-        "QPlatformScreenBuffer" => "qpa/qplatformscreenpageflipper.h",
-        "qplatformscreenpageflipper_qpa.h" => "qpa/qplatformscreenpageflipper.h",
-        "QPlatformScreenPageFlipper" => "qpa/qplatformscreenpageflipper.h",
-        "qplatformservices_qpa.h" => "qpa/qplatformservices.h",
-        "QPlatformServices" => "qpa/qplatformservices.h",
-        "qplatformsharedgraphicscache_qpa.h" => "qpa/qplatformsharedgraphicscache.h",
-        "QPlatformSharedGraphicsCache" => "qpa/qplatformsharedgraphicscache.h",
-        "qplatformsurface_qpa.h" => "qpa/qplatformsurface.h",
-        "QPlatformSurface" => "qpa/qplatformsurface.h",
-        "qplatformtheme_qpa.h" => "qpa/qplatformtheme.h",
-        "QPlatformTheme" => "qpa/qplatformtheme.h",
-        "qplatformthemefactory_qpa_p.h" => "qpa/qplatformthemefactory_p.h",
-        "qplatformthemeplugin_qpa.h" => "qpa/qplatformthemeplugin.h",
-        "QPlatformThemePlugin" => "qpa/qplatformthemeplugin.h",
-        "qplatformwindow_qpa.h" => "qpa/qplatformwindow.h",
-        "QPlatformWindow" => "qpa/qplatformwindow.h"
+        "QGenericPlugin" => "QtGui/QGenericPlugin",
+        "QGenericPluginFactory" => "QtGui/QGenericPluginFactory"
     },
     "QtWidgets" => {
         "qplatformmenu_qpa.h" => "qpa/qplatformmenu.h",
@@ -140,11 +70,15 @@
     }
 );
 
-@ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" );
-@ignore_for_include_check = ( "qsystemdetection.h", "qcompilerdetection.h", "qprocessordetection.h" );
-@ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" );
-@ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" );
-@ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtTest}", "$modules{QtDBus}" );
+@qpa_headers = ( qr/^qplatform/, qr/^qwindowsystem/ );
+my @angle_headers = ('egl.h', 'eglext.h', 'eglplatform.h', 'gl2.h', 'gl2ext.h', 'gl2platform.h', 'ShaderLang.h', 'khrplatform.h');
+my @internal_zlib_headers = ( "crc32.h", "deflate.h", "gzguts.h", "inffast.h", "inffixed.h", "inflate.h", "inftrees.h", "trees.h", "zutil.h" );
+my @zlib_headers = ( "zconf.h", "zlib.h" );
+my @harfbuzz_headers = ( "harfbuzz-buffer-private.h", "harfbuzz-buffer.h", "harfbuzz-dump.h", "harfbuzz-external.h", "harfbuzz-gdef-private.h", "harfbuzz-gdef.h", "harfbuzz-global.h", "harfbuzz-gpos-private.h", "harfbuzz-gpos.h", "harfbuzz-gsub-private.h", "harfbuzz-gsub.h", "harfbuzz-impl.h", "harfbuzz-open-private.h", "harfbuzz-open.h", "harfbuzz-shape.h", "harfbuzz-shaper-private.h", "harfbuzz-shaper.h", "harfbuzz-stream-private.h", "harfbuzz-stream.h", "harfbuzz.h" );
+@ignore_headers = ( @internal_zlib_headers );
+@ignore_for_include_check = ( "qsystemdetection.h", "qcompilerdetection.h", "qprocessordetection.h", @zlib_headers, @angle_headers, @harfbuzz_headers);
+@ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h", @zlib_headers, @angle_headers, @harfbuzz_headers);
+@ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h", @zlib_headers, @angle_headers, @harfbuzz_headers);
 %inject_headers = ( "$basedir/src/corelib/global" => [ "qconfig.h" ] );
 # Module dependencies.
 # Every module that is required to build this module should have one entry.
Domain: UI Framework / Uncategorized;