diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2012-07-26 13:23:28 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-03 00:38:09 +0200 |
| commit | 3d0af143ca51af0a3cbd81a794e6726992f9a86b (patch) | |
| tree | 76425c1863d878b016d4cb35e94d30df146b1e37 /sync.profile | |
| parent | 328550ff008da53d865f3a6f245aa4753d1b3527 (diff) | |
| download | qtbase-3d0af143ca51af0a3cbd81a794e6726992f9a86b.tar.gz qtbase-3d0af143ca51af0a3cbd81a794e6726992f9a86b.tar.bz2 qtbase-3d0af143ca51af0a3cbd81a794e6726992f9a86b.zip | |
Revert "Move QWindowSystemInterface out of qpa."
This reverts commit 784a877d3cd9a1a75aca9c83146389503a966071.
Conflicts:
src/plugins/platforms/cocoa/qcocoawindow.mm
src/testlib/qtestkeyboard.h
src/testlib/qtestmouse.h
src/testlib/qtesttouch.h
Change-Id: Iebfed179b3eb7f30e4c95edcae5a8ad6fd50330e
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'sync.profile')
| -rw-r--r-- | sync.profile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sync.profile b/sync.profile index 623dfd8a26..d63cdc0934 100644 --- a/sync.profile +++ b/sync.profile @@ -89,6 +89,9 @@ "QPlatformThemePlugin" => "qpa/qplatformthemeplugin.h", "qplatformwindow_qpa.h" => "qpa/qplatformwindow.h", "QPlatformWindow" => "qpa/qplatformwindow.h", + "qwindowsysteminterface_qpa.h" => "qpa/qwindowsysteminterface.h", + "QWindowSystemInterface" => "qpa/qwindowsysteminterface.h", + "qwindowsysteminterface_qpa_p.h" => "qpa/qwindowsysteminterface_p.h", "qgenericpluginfactory_qpa.h" => "QtGui/qgenericpluginfactory.h", "qgenericplugin_qpa.h" => "QtGui/qgenericplugin.h", "QGenericPlugin" => "QtGui/QGenericPlugin", @@ -121,7 +124,7 @@ } ); -@qpa_headers = ( qr/^qplatform/ ); +@qpa_headers = ( qr/^qplatform/, qr/^qwindowsystem/ ); @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" ); |