2010-11-15 19:55:17 +00:00
|
|
|
%modules = ( # path to module name map
|
|
|
|
"QtGui" => "$basedir/src/gui",
|
2011-05-06 22:02:01 +00:00
|
|
|
"QtWidgets" => "$basedir/src/widgets",
|
2011-08-16 14:38:56 +00:00
|
|
|
"QtPrintSupport" => "$basedir/src/printsupport",
|
2010-11-15 19:55:17 +00:00
|
|
|
"QtOpenGL" => "$basedir/src/opengl",
|
|
|
|
"QtCore" => "$basedir/src/corelib",
|
|
|
|
"QtXml" => "$basedir/src/xml",
|
|
|
|
"QtSql" => "$basedir/src/sql",
|
|
|
|
"QtNetwork" => "$basedir/src/network",
|
|
|
|
"QtTest" => "$basedir/src/testlib",
|
|
|
|
"QtDBus" => "$basedir/src/dbus",
|
2012-02-03 13:17:26 +00:00
|
|
|
"QtConcurrent" => "$basedir/src/concurrent",
|
2011-06-09 13:56:55 +00:00
|
|
|
"QtPlatformSupport" => "$basedir/src/platformsupport",
|
2010-11-15 19:55:17 +00:00
|
|
|
);
|
|
|
|
%moduleheaders = ( # restrict the module headers to those found in relative path
|
2011-08-16 08:50:00 +00:00
|
|
|
);
|
|
|
|
@allmoduleheadersprivate = (
|
2010-11-15 19:55:17 +00:00
|
|
|
);
|
|
|
|
%classnames = (
|
|
|
|
"qglobal.h" => "QtGlobal",
|
|
|
|
"qendian.h" => "QtEndian",
|
|
|
|
"qconfig.h" => "QtConfig",
|
|
|
|
"qplugin.h" => "QtPlugin",
|
|
|
|
"qalgorithms.h" => "QtAlgorithms",
|
|
|
|
"qcontainerfwd.h" => "QtContainerFwd",
|
|
|
|
"qdebug.h" => "QtDebug",
|
|
|
|
"qevent.h" => "QtEvents",
|
|
|
|
"qnamespace.h" => "Qt",
|
|
|
|
"qssl.h" => "QSsl",
|
|
|
|
"qtest.h" => "QTest",
|
|
|
|
"qtconcurrentmap.h" => "QtConcurrentMap",
|
|
|
|
"qtconcurrentfilter.h" => "QtConcurrentFilter",
|
|
|
|
"qtconcurrentrun.h" => "QtConcurrentRun",
|
|
|
|
);
|
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>
2012-04-26 23:33:35 +00:00
|
|
|
%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",
|
2012-06-19 20:21:35 +00:00
|
|
|
"QPlatformWindow" => "qpa/qplatformwindow.h",
|
|
|
|
"qwindowsysteminterface_qpa.h" => "qpa/qwindowsysteminterface.h",
|
|
|
|
"QWindowSystemInterface" => "qpa/qwindowsysteminterface.h",
|
|
|
|
"qwindowsysteminterface_qpa_p.h" => "qpa/qwindowsysteminterface_p.h"
|
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>
2012-04-26 23:33:35 +00:00
|
|
|
},
|
|
|
|
"QtWidgets" => {
|
|
|
|
"qplatformmenu_qpa.h" => "qpa/qplatformmenu.h",
|
|
|
|
"QPlatformMenu" => "qpa/qplatformmenu.h",
|
|
|
|
"QPlatformMenuAction" => "qpa/qplatformmenu.h",
|
2012-06-26 16:30:57 +00:00
|
|
|
"QPlatformMenuBar" => "qpa/qplatformmenu.h",
|
|
|
|
"QStandardItem" => "QtGui/QStandardItem",
|
|
|
|
"QStandardItemModel" => "QtGui/QStandardItemModel",
|
|
|
|
"qstandarditem.h" => "QtGui/qstandarditem.h",
|
|
|
|
"qstandarditemmodel.h" => "QtGui/qstandarditemmodel.h"
|
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>
2012-04-26 23:33:35 +00:00
|
|
|
},
|
|
|
|
"QtPrintSupport" => {
|
|
|
|
"qplatformprintersupport_qpa.h" => "qpa/qplatformprintersupport.h",
|
|
|
|
"QPlatformPrinterSupport" => "qpa/qplatformprintersupport.h",
|
|
|
|
"QPlatformPrinterSupportPlugin" => "XXXXXXXXXXXXXXXXXXXX",
|
|
|
|
"qplatformprintplugin_qpa.h" => "qpa/qplatformprintplugin.h",
|
|
|
|
"QPlatformPrintPlugin" => "qpa/qplatformprintplugin.h"
|
|
|
|
},
|
|
|
|
"QtPlatformSupport" => {
|
|
|
|
"qplatforminputcontextfactory_qpa_p.h" => "qpa/qplatforminputcontextfactory_p.h",
|
|
|
|
"qplatforminputcontextplugin_qpa_p.h" => "qpa/qplatforminputcontextplugin_p.h",
|
|
|
|
"QPlatformInputContextPlugin" => "qpa/qplatforminputcontextplugin_p.h"
|
|
|
|
}
|
|
|
|
);
|
2011-11-11 12:03:15 +00:00
|
|
|
%explicitheaders = (
|
|
|
|
"QtCore" => {
|
|
|
|
"QVariantHash" => "qvariant.h",
|
|
|
|
"QVariantList" => "qvariant.h",
|
|
|
|
"QVariantMap" => "qvariant.h",
|
|
|
|
}
|
|
|
|
);
|
2010-11-25 02:21:06 +00:00
|
|
|
|
2012-06-19 20:21:35 +00:00
|
|
|
@qpa_headers = ( qr/^qplatform/, qr/^qwindowsystem/ );
|
Add qprocessordetection.h
This detects the target processor based on preprocessor #defines,
setting Q_PROCESSOR_${FAMILY} accordingly. Optional
Q_PROCESSOR_${FAMILY}_${REVISION/VARIANT} #defines are also provided,
usually dependent on how the compiler is invoked.
Currently detected families (and variants) include:
ARM (v5, v6, and v7)
X86 (i386 and x86_64, as X86_32 and X86_64 respectively)
IA-64
MIPS (I, II, III, IV, 32, 64)
Other families that currently are not detected, but Qt has (or had)
support for include:
Alpha
AVR32
Blackfin
PA-RISC
PowerPC (optional 64-bit variant)
S390 (and S390X 64-bit variant)
SH (and SH-4A)
SPARC (SPARC V9)
Detection for these is currently commented out, and can
be easily enabled later.
Change-Id: I571f245c189b9d80c7c3a5369ac595a271f37c8b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-02-05 12:10:55 +00:00
|
|
|
@ignore_for_include_check = ( "qsystemdetection.h", "qcompilerdetection.h", "qprocessordetection.h" );
|
2010-11-15 19:55:17 +00:00
|
|
|
@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}" );
|
2012-04-11 12:13:01 +00:00
|
|
|
%inject_headers = ( "$basedir/src/corelib/global" => [ "qconfig.h" ] );
|
2011-07-06 08:36:10 +00:00
|
|
|
# Module dependencies.
|
|
|
|
# Every module that is required to build this module should have one entry.
|
2011-04-27 10:34:11 +00:00
|
|
|
# Each of the module version specifiers can take one of the following values:
|
|
|
|
# - A specific Git revision.
|
2011-07-06 08:36:10 +00:00
|
|
|
# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
|
|
|
|
#
|
2011-04-27 10:34:11 +00:00
|
|
|
%dependencies = (
|
|
|
|
);
|