diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-01 10:27:41 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-02 09:24:11 +0100 |
| commit | d7e4980132057aa10e54137114bf65e06c455030 (patch) | |
| tree | 9d6ae36efa0cf84a612bfec6cf3dd2ea7f7e3446 /sync.profile | |
| parent | 44c402b4bfba44480382244b8409fb3cf34d7ac1 (diff) | |
| parent | a732576a66ff2bbd9c0b41cd5f3505a4d2fbf043 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Blacklist tst_QMenuBar::taskQTBUG46812_doNotLeaveMenubarHighlighted() on macOS.
Conflicts:
mkspecs/features/mac/default_post.prf
mkspecs/features/mac/sdk.prf
mkspecs/features/uikit/default_post.prf
mkspecs/features/uikit/sdk.prf
src/angle/src/libEGL/libEGL.pro
src/platformsupport/fontdatabases/fontdatabases.pro
src/platformsupport/platformsupport.pro
src/plugins/platforms/cocoa/qnswindowdelegate.mm
src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp
src/plugins/platforms/ios/ios.pro
src/plugins/platforms/ios/kernel.pro
tests/auto/widgets/widgets/qmenubar/BLACKLIST
tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
Task-number: QTBUG-56853
Change-Id: If58785210feee3550892fc7768cce90e75a2416c
Diffstat (limited to 'sync.profile')
| -rw-r--r-- | sync.profile | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/sync.profile b/sync.profile index 4da3499667..2f6c5399d4 100644 --- a/sync.profile +++ b/sync.profile @@ -10,7 +10,21 @@ "QtTest" => "$basedir/src/testlib", "QtDBus" => "$basedir/src/dbus", "QtConcurrent" => "$basedir/src/concurrent", - "QtPlatformSupport" => "$basedir/src/platformsupport", + "QtAccessibilitySupport" => "$basedir/src/platformsupport/accessibility", + "QtLinuxAccessibilitySupport" => "$basedir/src/platformsupport/linuxaccessibility", + "QtClipboardSupport" => "$basedir/src/platformsupport/clipboard", + "QtDeviceDiscoverySupport" => "$basedir/src/platformsupport/devicediscovery", + "QtEventDispatcherSupport" => "$basedir/src/platformsupport/eventdispatchers", + "QtFontDatabaseSupport" => "$basedir/src/platformsupport/fontdatabases", + "QtInputSupport" => "$basedir/src/platformsupport/input", + "QtPlatformCompositorSupport" => "$basedir/src/platformsupport/platformcompositor", + "QtServiceSupport" => "$basedir/src/platformsupport/services", + "QtThemeSupport" => "$basedir/src/platformsupport/themes", + "QtGraphicsSupport" => "$basedir/src/platformsupport/graphics", + "QtCglSupport" => "$basedir/src/platformsupport/cglconvenience", + "QtEglSupport" => "$basedir/src/platformsupport/eglconvenience", + "QtFbSupport" => "$basedir/src/platformsupport/fbconvenience", + "QtGlxSupport" => "$basedir/src/platformsupport/glxconvenience", "QtPlatformHeaders" => "$basedir/src/platformheaders", "QtANGLE/KHR" => "!$basedir/src/3rdparty/angle/include/KHR", "QtANGLE/GLES2" => "!$basedir/src/3rdparty/angle/include/GLES2", |