Expose QPA API under qpa/*
authorGirish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Thu, 26 Apr 2012 23:33:35 +0000 (01:33 +0200)
committerQt by Nokia <qt-info@nokia.com>
Mon, 7 May 2012 18:25:24 +0000 (20:25 +0200)
commit36547f4eff44361f7a6acd0cff107c0e47561f93
treeaafbf1b22400bbaf90046b415490667164a2d93a
parent30a424543858a14a649624e8ce21e4506c8d9532
Expose QPA API under qpa/*

The main reasons for doing this are:
1. _qpa.h end up in the master QtGui include file. QtGui is meant for
userland applications. qpa code is neither binary nor source compatible.
Inadvertant use of QPA api makes the user code binary-incompatible.
2. syncqt creates forwarding headers for non-private header files. This
gives people the impression that this is public API.

As discussed on the mailing list, even though QPA api is internal and subject
to change, it needs to  treated differently from private headers since they
will be used by  in-qtbase and out-of-qtbase plugins.

This commit does the following:
1. The _qpa in QPA header files is dropped.
2. syncqt now treats any file with qplatform prefix as a special file and
moves it to qpa/ directory. The recommended way of using QPA API in plugins
is: #include <qpa/qplatformfoo.h>. This allows the user include QPA API
from multiple modules (for example, qplatformfoo might be in QtPrintSupport)
3. The user needs to explicitly add QT += <module>-private to get access to
the qpa api.
4. Creates compat headers for the olden style qplatformfoo_qpa.h and QPlatformFoo
includes.

This commit does not change the cpp filenames. This requires a more careful
merging of existing non qpa cpp files and existing cpp files on a case by
case basis. This can be done at anytime.

The following files are not renamed as part of this changed but will be fixed
as part of a future change:
src/gui/kernel/qgenericpluginfactory_qpa.h
src/gui/kernel/qgenericplugin_qpa.h
src/gui/kernel/qwindowsysteminterface_qpa.h

files were renamed using

    for x in `find . -name "qplatform*_qpa.h"`; do git mv $x "${x/_qpa.h/.h}"; done
    for x in `find . -name "qplatform*_qpa_p.h"`; do git mv $x "${x/_qpa_p.h/_p.h}"; done

includes were renamed using script

for file in `find . -name "*.h" -or -name "*.cpp" -or -name "*.mm"`; do
    sed -i -e 's,.*#.*include.*<\(Qt.*/\)\?\(QPlatform.*\)>,#include <qpa/\L\2.h>,g' \
        -e 's,.*#.*include.*"\(Qt.*/\)\?\(QPlatform.*\)",#include <qpa/\L\2.h>,g' \
        -e 's,.*#.*include.* "\(qplatform.*\)_qpa.h",#include <qpa/\L\1.h>,g' \
        -e 's,.*#.*include.*"\(qplatform.*\)_qpa_p.h",#include <qpa/\L\1_p.h>,g' \
        -e 's,.*#.*include.*<\(Qt.*/\|Qt.*/private/\|private/\)\?\(qplatform.*\)_qpa\(.*\)>,#include <qpa/\2\3>,g' \
        -e 's,.*#.*include.*"\(Qt.*/\|Qt.*/private/\|private/\)\?\(qplatform.*\)_qpa\(.*\)",#include <qpa/\2\3>,g' \
        $file
done

Change-Id: I04a350314a45746e3911f54b3b21ad03315afb67
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
282 files changed:
bin/syncqt
examples/opengl/hellowindow/main.cpp
src/gui/accessible/accessible.pri
src/gui/accessible/qaccessible.cpp
src/gui/accessible/qplatformaccessibility.h [moved from src/gui/accessible/qplatformaccessibility_qpa.h with 100% similarity]
src/gui/accessible/qplatformaccessibility_qpa.cpp
src/gui/image/image.pri
src/gui/image/qbitmap.cpp
src/gui/image/qimage.cpp
src/gui/image/qimagepixmapcleanuphooks.cpp
src/gui/image/qnativeimage.cpp
src/gui/image/qpixmap.cpp
src/gui/image/qpixmap_blitter_p.h
src/gui/image/qpixmap_raster_p.h
src/gui/image/qpixmap_win.cpp
src/gui/image/qplatformpixmap.cpp
src/gui/image/qplatformpixmap.h [moved from src/gui/image/qplatformpixmap_qpa.h with 100% similarity]
src/gui/kernel/kernel.pri
src/gui/kernel/qclipboard_qpa.cpp
src/gui/kernel/qcursor_qpa.cpp
src/gui/kernel/qdnd.cpp
src/gui/kernel/qguiapplication.cpp
src/gui/kernel/qguiapplication_p.h
src/gui/kernel/qinputmethod.cpp
src/gui/kernel/qinputmethod_p.h
src/gui/kernel/qkeysequence.cpp
src/gui/kernel/qopenglcontext.cpp
src/gui/kernel/qplatformclipboard.h [moved from src/gui/kernel/qplatformclipboard_qpa.h with 100% similarity]
src/gui/kernel/qplatformclipboard_qpa.cpp
src/gui/kernel/qplatformcursor.h [moved from src/gui/kernel/qplatformcursor_qpa.h with 99% similarity]
src/gui/kernel/qplatformcursor_qpa.cpp
src/gui/kernel/qplatformdialoghelper.h [moved from src/gui/kernel/qplatformdialoghelper_qpa.h with 100% similarity]
src/gui/kernel/qplatformdialoghelper_qpa.cpp
src/gui/kernel/qplatformdrag.h [moved from src/gui/kernel/qplatformdrag_qpa.h with 100% similarity]
src/gui/kernel/qplatformdrag_qpa.cpp
src/gui/kernel/qplatforminputcontext.h [moved from src/gui/kernel/qplatforminputcontext_qpa.h with 100% similarity]
src/gui/kernel/qplatforminputcontext_p.h [moved from src/gui/kernel/qplatforminputcontext_qpa_p.h with 100% similarity]
src/gui/kernel/qplatforminputcontext_qpa.cpp
src/gui/kernel/qplatformintegration.h [moved from src/gui/kernel/qplatformintegration_qpa.h with 99% similarity]
src/gui/kernel/qplatformintegration_qpa.cpp
src/gui/kernel/qplatformintegrationfactory_p.h [moved from src/gui/kernel/qplatformintegrationfactory_qpa_p.h with 100% similarity]
src/gui/kernel/qplatformintegrationfactory_qpa.cpp
src/gui/kernel/qplatformintegrationplugin.h [moved from src/gui/kernel/qplatformintegrationplugin_qpa.h with 100% similarity]
src/gui/kernel/qplatformintegrationplugin_qpa.cpp
src/gui/kernel/qplatformnativeinterface.h [moved from src/gui/kernel/qplatformnativeinterface_qpa.h with 100% similarity]
src/gui/kernel/qplatformnativeinterface_qpa.cpp
src/gui/kernel/qplatformopenglcontext.h [moved from src/gui/kernel/qplatformopenglcontext_qpa.h with 100% similarity]
src/gui/kernel/qplatformopenglcontext_qpa.cpp
src/gui/kernel/qplatformscreen.h [moved from src/gui/kernel/qplatformscreen_qpa.h with 98% similarity]
src/gui/kernel/qplatformscreen_p.h [moved from src/gui/kernel/qplatformscreen_qpa_p.h with 100% similarity]
src/gui/kernel/qplatformscreen_qpa.cpp
src/gui/kernel/qplatformscreenpageflipper.h [moved from src/gui/kernel/qplatformscreenpageflipper_qpa.h with 100% similarity]
src/gui/kernel/qplatformscreenpageflipper_qpa.cpp
src/gui/kernel/qplatformservices.h [moved from src/gui/kernel/qplatformservices_qpa.h with 100% similarity]
src/gui/kernel/qplatformservices_qpa.cpp
src/gui/kernel/qplatformsharedgraphicscache.h [moved from src/gui/kernel/qplatformsharedgraphicscache_qpa.h with 100% similarity]
src/gui/kernel/qplatformsharedgraphicscache_qpa.cpp
src/gui/kernel/qplatformsurface.h [moved from src/gui/kernel/qplatformsurface_qpa.h with 100% similarity]
src/gui/kernel/qplatformsurface_qpa.cpp
src/gui/kernel/qplatformtheme.h [moved from src/gui/kernel/qplatformtheme_qpa.h with 100% similarity]
src/gui/kernel/qplatformtheme_qpa.cpp
src/gui/kernel/qplatformthemefactory_p.h [moved from src/gui/kernel/qplatformthemefactory_qpa_p.h with 100% similarity]
src/gui/kernel/qplatformthemefactory_qpa.cpp
src/gui/kernel/qplatformthemeplugin.h [moved from src/gui/kernel/qplatformthemeplugin_qpa.h with 100% similarity]
src/gui/kernel/qplatformthemeplugin_qpa.cpp
src/gui/kernel/qplatformwindow.h [moved from src/gui/kernel/qplatformwindow_qpa.h with 97% similarity]
src/gui/kernel/qplatformwindow_qpa.cpp
src/gui/kernel/qscreen.cpp
src/gui/kernel/qscreen_p.h
src/gui/kernel/qstylehints.cpp
src/gui/kernel/qwindow.cpp
src/gui/kernel/qwindow_p.h
src/gui/kernel/qwindowsysteminterface_qpa.cpp
src/gui/opengl/qopengltexturecache.cpp
src/gui/painting/painting.pri
src/gui/painting/qbackingstore.cpp
src/gui/painting/qplatformbackingstore.h [moved from src/gui/painting/qplatformbackingstore_qpa.h with 100% similarity]
src/gui/painting/qplatformbackingstore_qpa.cpp
src/gui/text/qfont.cpp
src/gui/text/qfont_qpa.cpp
src/gui/text/qfontdatabase.cpp
src/gui/text/qfontdatabase_qpa.cpp
src/gui/text/qfontengine_qpa.cpp
src/gui/text/qplatformfontdatabase.h [moved from src/gui/text/qplatformfontdatabase_qpa.h with 100% similarity]
src/gui/text/qplatformfontdatabase_qpa.cpp
src/gui/text/qrawfont_qpa.cpp
src/gui/text/text.pri
src/gui/util/qdesktopservices.cpp
src/opengl/qgl.cpp
src/opengl/qgl_qpa.cpp
src/platformsupport/dnd/qsimpledrag_p.h
src/platformsupport/eglconvenience/qeglplatformcontext.cpp
src/platformsupport/eglconvenience/qeglplatformcontext_p.h
src/platformsupport/fb_base/fb_base.cpp
src/platformsupport/fb_base/fb_base_p.h
src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp
src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h
src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h
src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
src/platformsupport/inputcontext/inputcontext.pri
src/platformsupport/inputcontext/qplatforminputcontextfactory_p.h [moved from src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa_p.h with 100% similarity]
src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp
src/platformsupport/inputcontext/qplatforminputcontextplugin_p.h [moved from src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa_p.h with 100% similarity]
src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa.cpp
src/platformsupport/printersupport/genericunix/qgenericunixprintersupport_p.h
src/platformsupport/services/genericunix/qgenericunixservices_p.h
src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
src/plugins/platforminputcontexts/ibus/ibus.pro
src/plugins/platforminputcontexts/ibus/main.cpp
src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
src/plugins/platforminputcontexts/maliit/main.cpp
src/plugins/platforminputcontexts/maliit/maliit.pro
src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h
src/plugins/platforms/cocoa/cocoa.pro
src/plugins/platforms/cocoa/main.mm
src/plugins/platforms/cocoa/qcocoabackingstore.h
src/plugins/platforms/cocoa/qcocoaclipboard.h
src/plugins/platforms/cocoa/qcocoacolordialoghelper.h
src/plugins/platforms/cocoa/qcocoacursor.h
src/plugins/platforms/cocoa/qcocoadrag.h
src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
src/plugins/platforms/cocoa/qcocoafiledialoghelper.h
src/plugins/platforms/cocoa/qcocoafontdialoghelper.h
src/plugins/platforms/cocoa/qcocoaglcontext.h
src/plugins/platforms/cocoa/qcocoahelpers.mm
src/plugins/platforms/cocoa/qcocoainputcontext.h
src/plugins/platforms/cocoa/qcocoaintegration.h
src/plugins/platforms/cocoa/qcocoaintegration.mm
src/plugins/platforms/cocoa/qcocoanativeinterface.h
src/plugins/platforms/cocoa/qcocoanativeinterface.mm
src/plugins/platforms/cocoa/qcocoaprintersupport.h
src/plugins/platforms/cocoa/qcocoaservices.h
src/plugins/platforms/cocoa/qcocoasystemsettings.h
src/plugins/platforms/cocoa/qcocoatheme.h
src/plugins/platforms/cocoa/qcocoawindow.h
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/cocoa/qmenu_mac.h
src/plugins/platforms/cocoa/qpaintengine_mac.mm
src/plugins/platforms/cocoa/qprintengine_mac.mm
src/plugins/platforms/directfb/main.cpp
src/plugins/platforms/directfb/qdirectfb_egl.cpp
src/plugins/platforms/directfb/qdirectfbbackingstore.h
src/plugins/platforms/directfb/qdirectfbcursor.h
src/plugins/platforms/directfb/qdirectfbeglhooks.h
src/plugins/platforms/directfb/qdirectfbglcontext.h
src/plugins/platforms/directfb/qdirectfbintegration.cpp
src/plugins/platforms/directfb/qdirectfbintegration.h
src/plugins/platforms/directfb/qdirectfbscreen.h
src/plugins/platforms/directfb/qdirectfbwindow.h
src/plugins/platforms/eglfs/main.cpp
src/plugins/platforms/eglfs/qeglfsbackingstore.h
src/plugins/platforms/eglfs/qeglfshooks.h
src/plugins/platforms/eglfs/qeglfsintegration.cpp
src/plugins/platforms/eglfs/qeglfsintegration.h
src/plugins/platforms/eglfs/qeglfsscreen.h
src/plugins/platforms/eglfs/qeglfswindow.h
src/plugins/platforms/kms/main.cpp
src/plugins/platforms/kms/qkmsbackingstore.h
src/plugins/platforms/kms/qkmscontext.h
src/plugins/platforms/kms/qkmscursor.h
src/plugins/platforms/kms/qkmsintegration.h
src/plugins/platforms/kms/qkmsnativeinterface.h
src/plugins/platforms/kms/qkmsscreen.h
src/plugins/platforms/kms/qkmswindow.h
src/plugins/platforms/linuxfb/main.cpp
src/plugins/platforms/linuxfb/qlinuxfbintegration.h
src/plugins/platforms/minimal/main.cpp
src/plugins/platforms/minimal/qminimalbackingstore.cpp
src/plugins/platforms/minimal/qminimalbackingstore.h
src/plugins/platforms/minimal/qminimalintegration.cpp
src/plugins/platforms/minimal/qminimalintegration.h
src/plugins/platforms/openwfd/main.cpp
src/plugins/platforms/openwfd/qopenwfdbackingstore.h
src/plugins/platforms/openwfd/qopenwfdglcontext.h
src/plugins/platforms/openwfd/qopenwfdintegration.h
src/plugins/platforms/openwfd/qopenwfdnativeinterface.h
src/plugins/platforms/openwfd/qopenwfdscreen.h
src/plugins/platforms/openwfd/qopenwfdwindow.h
src/plugins/platforms/qnx/main.h
src/plugins/platforms/qnx/qqnxclipboard.h
src/plugins/platforms/qnx/qqnxglbackingstore.h
src/plugins/platforms/qnx/qqnxglcontext.h
src/plugins/platforms/qnx/qqnxinputcontext_imf.h
src/plugins/platforms/qnx/qqnxinputcontext_noimf.h
src/plugins/platforms/qnx/qqnxintegration.cpp
src/plugins/platforms/qnx/qqnxintegration.h
src/plugins/platforms/qnx/qqnxnativeinterface.h
src/plugins/platforms/qnx/qqnxrasterbackingstore.h
src/plugins/platforms/qnx/qqnxscreen.h
src/plugins/platforms/qnx/qqnxservices.h
src/plugins/platforms/qnx/qqnxwindow.h
src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
src/plugins/platforms/windows/accessible/qwindowsaccessibility.h
src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp
src/plugins/platforms/windows/main.cpp
src/plugins/platforms/windows/qwindowsbackingstore.h
src/plugins/platforms/windows/qwindowsclipboard.h
src/plugins/platforms/windows/qwindowscontext.cpp
src/plugins/platforms/windows/qwindowscursor.h
src/plugins/platforms/windows/qwindowsdialoghelpers.h
src/plugins/platforms/windows/qwindowsdrag.h
src/plugins/platforms/windows/qwindowsfontdatabase.h
src/plugins/platforms/windows/qwindowsglcontext.cpp
src/plugins/platforms/windows/qwindowsglcontext.h
src/plugins/platforms/windows/qwindowsinputcontext.h
src/plugins/platforms/windows/qwindowsintegration.cpp
src/plugins/platforms/windows/qwindowsintegration.h
src/plugins/platforms/windows/qwindowsscreen.h
src/plugins/platforms/windows/qwindowsservices.h
src/plugins/platforms/windows/qwindowstheme.h
src/plugins/platforms/windows/qwindowswindow.h
src/plugins/platforms/xcb/main.cpp
src/plugins/platforms/xcb/qdri2context.h
src/plugins/platforms/xcb/qglxintegration.h
src/plugins/platforms/xcb/qxcbbackingstore.h
src/plugins/platforms/xcb/qxcbclipboard.h
src/plugins/platforms/xcb/qxcbcursor.h
src/plugins/platforms/xcb/qxcbdrag.h
src/plugins/platforms/xcb/qxcbintegration.cpp
src/plugins/platforms/xcb/qxcbintegration.h
src/plugins/platforms/xcb/qxcbkeyboard.cpp
src/plugins/platforms/xcb/qxcbnativeinterface.h
src/plugins/platforms/xcb/qxcbscreen.h
src/plugins/platforms/xcb/qxcbwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.h
src/plugins/printsupport/cocoa/cocoa.pro
src/plugins/printsupport/cocoa/main.cpp
src/plugins/printsupport/windows/main.cpp
src/plugins/printsupport/windows/qwindowsprintersupport.h
src/printsupport/dialogs/qpagesetupdialog_mac.mm
src/printsupport/dialogs/qpagesetupdialog_win.cpp
src/printsupport/kernel/kernel.pri
src/printsupport/kernel/qplatformprintersupport.h [moved from src/printsupport/kernel/qplatformprintersupport_qpa.h with 100% similarity]
src/printsupport/kernel/qplatformprintersupport_qpa.cpp
src/printsupport/kernel/qplatformprintplugin.cpp
src/printsupport/kernel/qplatformprintplugin.h [moved from src/printsupport/kernel/qplatformprintplugin_qpa.h with 100% similarity]
src/printsupport/kernel/qprintengine_win.cpp
src/printsupport/kernel/qprinter.cpp
src/printsupport/kernel/qprinterinfo.cpp
src/tools/uic/qclass_lib_map.h
src/widgets/dialogs/qdialog.cpp
src/widgets/dialogs/qdialog_p.h
src/widgets/dialogs/qfontdialog_p.h
src/widgets/dialogs/qmessagebox.cpp
src/widgets/dialogs/qwizard_win.cpp
src/widgets/itemviews/qitemdelegate.cpp
src/widgets/itemviews/qstyleditemdelegate.cpp
src/widgets/kernel/kernel.pri
src/widgets/kernel/qapplication.cpp
src/widgets/kernel/qapplication_p.h
src/widgets/kernel/qapplication_qpa.cpp
src/widgets/kernel/qiconloader.cpp
src/widgets/kernel/qplatformmenu.h [moved from src/widgets/kernel/qplatformmenu_qpa.h with 100% similarity]
src/widgets/kernel/qplatformmenu_qpa.cpp
src/widgets/kernel/qwhatsthis.cpp
src/widgets/kernel/qwidget.cpp
src/widgets/kernel/qwidget_qpa.cpp
src/widgets/styles/qcommonstyle.cpp
src/widgets/styles/qmacstyle_mac.mm
src/widgets/styles/qwindowsvistastyle.cpp
src/widgets/styles/qwindowsxpstyle.cpp
src/widgets/util/qsystemtrayicon_win.cpp
src/widgets/util/qsystemtrayicon_x11.cpp
src/widgets/widgets/qcombobox.cpp
src/widgets/widgets/qmenu.cpp
src/widgets/widgets/qmenu_p.h
src/widgets/widgets/qmenubar.cpp
src/widgets/widgets/qwidgetlinecontrol.cpp
sync.profile
tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp
tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
tests/auto/opengl/qgl/tst_qgl.cpp
tests/auto/other/languagechange/tst_languagechange.cpp
tests/auto/shared/platforminputcontext.h
tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
tests/auto/widgets/kernel/qaction/tst_qaction.cpp
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp