From 36547f4eff44361f7a6acd0cff107c0e47561f93 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Fri, 27 Apr 2012 01:33:35 +0200 Subject: Expose QPA API under qpa/* MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 . 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 += -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 ,g' \ -e 's,.*#.*include.*"\(Qt.*/\)\?\(QPlatform.*\)",#include ,g' \ -e 's,.*#.*include.* "\(qplatform.*\)_qpa.h",#include ,g' \ -e 's,.*#.*include.*"\(qplatform.*\)_qpa_p.h",#include ,g' \ -e 's,.*#.*include.*<\(Qt.*/\|Qt.*/private/\|private/\)\?\(qplatform.*\)_qpa\(.*\)>,#include ,g' \ -e 's,.*#.*include.*"\(Qt.*/\|Qt.*/private/\|private/\)\?\(qplatform.*\)_qpa\(.*\)",#include ,g' \ $file done Change-Id: I04a350314a45746e3911f54b3b21ad03315afb67 Reviewed-by: Morten Johan Sørvig Reviewed-by: Samuel Rødal Reviewed-by: Friedemann Kleint Reviewed-by: Sean Harmer Reviewed-by: Lars Knoll Reviewed-by: Gunnar Sletta --- src/plugins/platforms/openwfd/main.cpp | 2 +- src/plugins/platforms/openwfd/qopenwfdbackingstore.h | 2 +- src/plugins/platforms/openwfd/qopenwfdglcontext.h | 2 +- src/plugins/platforms/openwfd/qopenwfdintegration.h | 4 ++-- src/plugins/platforms/openwfd/qopenwfdnativeinterface.h | 2 +- src/plugins/platforms/openwfd/qopenwfdscreen.h | 2 +- src/plugins/platforms/openwfd/qopenwfdwindow.h | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/plugins/platforms/openwfd') diff --git a/src/plugins/platforms/openwfd/main.cpp b/src/plugins/platforms/openwfd/main.cpp index 4e583e9b2d..0d9508da6c 100644 --- a/src/plugins/platforms/openwfd/main.cpp +++ b/src/plugins/platforms/openwfd/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include #include "qopenwfdintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/openwfd/qopenwfdbackingstore.h b/src/plugins/platforms/openwfd/qopenwfdbackingstore.h index 4002fd8ffc..84caa81f97 100644 --- a/src/plugins/platforms/openwfd/qopenwfdbackingstore.h +++ b/src/plugins/platforms/openwfd/qopenwfdbackingstore.h @@ -42,7 +42,7 @@ #ifndef QOPENWFDBACKINGSTORE_H #define QOPENWFDBACKINGSTORE_H -#include +#include #include class QOpenWFDBackingStore : public QPlatformBackingStore diff --git a/src/plugins/platforms/openwfd/qopenwfdglcontext.h b/src/plugins/platforms/openwfd/qopenwfdglcontext.h index d353eddbb0..7a613cc8a7 100644 --- a/src/plugins/platforms/openwfd/qopenwfdglcontext.h +++ b/src/plugins/platforms/openwfd/qopenwfdglcontext.h @@ -42,7 +42,7 @@ #ifndef QOPENWFDGLCONTEXT_H #define QOPENWFDGLCONTEXT_H -#include +#include #include "qopenwfddevice.h" diff --git a/src/plugins/platforms/openwfd/qopenwfdintegration.h b/src/plugins/platforms/openwfd/qopenwfdintegration.h index 5737dbb00e..7b6a95497f 100644 --- a/src/plugins/platforms/openwfd/qopenwfdintegration.h +++ b/src/plugins/platforms/openwfd/qopenwfdintegration.h @@ -42,8 +42,8 @@ #ifndef QOPENWFDINTEGRATION_H #define QOPENWFDINTEGRATION_H -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/openwfd/qopenwfdnativeinterface.h b/src/plugins/platforms/openwfd/qopenwfdnativeinterface.h index 955fca7d41..f4ccfe5958 100644 --- a/src/plugins/platforms/openwfd/qopenwfdnativeinterface.h +++ b/src/plugins/platforms/openwfd/qopenwfdnativeinterface.h @@ -42,7 +42,7 @@ #ifndef QOPENWFDNATIVEINTERFACE_H #define QOPENWFDNATIVEINTERFACE_H -#include +#include #include diff --git a/src/plugins/platforms/openwfd/qopenwfdscreen.h b/src/plugins/platforms/openwfd/qopenwfdscreen.h index 8993205a16..ff4a83f663 100644 --- a/src/plugins/platforms/openwfd/qopenwfdscreen.h +++ b/src/plugins/platforms/openwfd/qopenwfdscreen.h @@ -42,7 +42,7 @@ #ifndef QOPENWFDSCREEN_H #define QOPENWFDSCREEN_H -#include +#include #include "qopenwfdoutputbuffer.h" diff --git a/src/plugins/platforms/openwfd/qopenwfdwindow.h b/src/plugins/platforms/openwfd/qopenwfdwindow.h index ca531b07ae..9f777b3c4a 100644 --- a/src/plugins/platforms/openwfd/qopenwfdwindow.h +++ b/src/plugins/platforms/openwfd/qopenwfdwindow.h @@ -42,7 +42,7 @@ #ifndef QOPENWFDWINDOW_H #define QOPENWFDWINDOW_H -#include +#include #include #include "qopenwfdport.h" -- cgit v1.2.3