diff options
Diffstat (limited to 'src/platformheaders')
20 files changed, 147 insertions, 26 deletions
diff --git a/src/platformheaders/.prev_CMakeLists.txt b/src/platformheaders/.prev_CMakeLists.txt index 5456de5c80..d752381fb7 100644 --- a/src/platformheaders/.prev_CMakeLists.txt +++ b/src/platformheaders/.prev_CMakeLists.txt @@ -1,2 +1,25 @@ # Generated from platformheaders.pro. +##################################################################### +## PlatformHeaders Module: +##################################################################### + +qt_add_module(PlatformHeaders + HEADER_MODULE + SOURCES + cocoafunctions/qcocoawindowfunctions_p.h + eglfsfunctions/qeglfsfunctions_p.h + helper/qplatformheaderhelper_p.h + linuxfbfunctions/qlinuxfbfunctions_p.h + waylandfunctions/qwaylandwindowfunctions_p.h + windowsfunctions/qwindowswindowfunctions_p.h + xcbfunctions/qxcbscreenfunctions_p.h + xcbfunctions/qxcbwindowfunctions_p.h + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui +) +qt_add_docs(PlatformHeaders + doc/qtplatformheaders.qdocconf +) + diff --git a/src/platformheaders/CMakeLists.txt b/src/platformheaders/CMakeLists.txt index 820bbb71a5..63bb60576f 100644 --- a/src/platformheaders/CMakeLists.txt +++ b/src/platformheaders/CMakeLists.txt @@ -1,13 +1,27 @@ # Generated from platformheaders.pro. -# special case begin - -# FIXME Add the rest of the stuff? I don't think any other stuff is needed? - -qt_add_module(PlatformHeaders HEADER_MODULE) +##################################################################### +## PlatformHeaders Module: +##################################################################### +qt_add_module(PlatformHeaders + HEADER_MODULE + # special case begin + # SOURCES + # cocoafunctions/qcocoawindowfunctions_p.h + # eglfsfunctions/qeglfsfunctions_p.h + # helper/qplatformheaderhelper_p.h + # linuxfbfunctions/qlinuxfbfunctions_p.h + # waylandfunctions/qwaylandwindowfunctions_p.h + # windowsfunctions/qwindowswindowfunctions_p.h + # xcbfunctions/qxcbscreenfunctions_p.h + # xcbfunctions/qxcbwindowfunctions_p.h + # special case end + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui +) qt_add_docs(PlatformHeaders doc/qtplatformheaders.qdocconf ) -# special case end diff --git a/src/platformheaders/cocoafunctions/cocoafunctions.pri b/src/platformheaders/cocoafunctions/cocoafunctions.pri index 3987523f9a..640d29c8ce 100644 --- a/src/platformheaders/cocoafunctions/cocoafunctions.pri +++ b/src/platformheaders/cocoafunctions/cocoafunctions.pri @@ -1 +1 @@ -HEADERS += $$PWD/qcocoawindowfunctions.h +HEADERS += $$PWD/qcocoawindowfunctions_p.h diff --git a/src/platformheaders/cocoafunctions/qcocoawindowfunctions.h b/src/platformheaders/cocoafunctions/qcocoawindowfunctions_p.h index 248900ad2a..7701509a66 100644 --- a/src/platformheaders/cocoafunctions/qcocoawindowfunctions.h +++ b/src/platformheaders/cocoafunctions/qcocoawindowfunctions_p.h @@ -40,7 +40,18 @@ #ifndef QCOCOAWINDOWFUNCTIONS_H #define QCOCOAWINDOWFUNCTIONS_H -#include <QtPlatformHeaders/QPlatformHeaderHelper> +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtPlatformHeaders/private/qplatformheaderhelper_p.h> QT_BEGIN_NAMESPACE diff --git a/src/platformheaders/doc/snippets/qwindowswindowfunctions/main.cpp b/src/platformheaders/doc/snippets/qwindowswindowfunctions/main.cpp index f8f4f28ed3..53b9a58867 100644 --- a/src/platformheaders/doc/snippets/qwindowswindowfunctions/main.cpp +++ b/src/platformheaders/doc/snippets/qwindowswindowfunctions/main.cpp @@ -49,7 +49,7 @@ ****************************************************************************/ #include <QtWidgets> -#include <QtPlatformHeaders/qwindowswindowfunctions.h> +#include <QtPlatformHeaders/private/qwindowswindowfunctions_p.h> //! [0] int main(int argc, char **argv) diff --git a/src/platformheaders/doc/snippets/qxcbwindowfunctions/main.cpp b/src/platformheaders/doc/snippets/qxcbwindowfunctions/main.cpp index c2b66e6aa2..3299292993 100644 --- a/src/platformheaders/doc/snippets/qxcbwindowfunctions/main.cpp +++ b/src/platformheaders/doc/snippets/qxcbwindowfunctions/main.cpp @@ -49,7 +49,7 @@ ****************************************************************************/ #include <QtWidgets> -#include <QtPlatformHeaders/qxcbwindowfunctions.h> +#include <QtPlatformHeaders/private/qxcbwindowfunctions_p.h> //! [0] int main(int argc, char **argv) diff --git a/src/platformheaders/eglfsfunctions/eglfsfunctions.pri b/src/platformheaders/eglfsfunctions/eglfsfunctions.pri index e4e645f5a5..76c6383ddb 100644 --- a/src/platformheaders/eglfsfunctions/eglfsfunctions.pri +++ b/src/platformheaders/eglfsfunctions/eglfsfunctions.pri @@ -1 +1 @@ -HEADERS += $$PWD/qeglfsfunctions.h +HEADERS += $$PWD/qeglfsfunctions_p.h diff --git a/src/platformheaders/eglfsfunctions/qeglfsfunctions.h b/src/platformheaders/eglfsfunctions/qeglfsfunctions_p.h index 869fe7ce3f..1eb177f694 100644 --- a/src/platformheaders/eglfsfunctions/qeglfsfunctions.h +++ b/src/platformheaders/eglfsfunctions/qeglfsfunctions_p.h @@ -40,6 +40,17 @@ #ifndef QEGLFSFUNCTIONS_H #define QEGLFSFUNCTIONS_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QByteArray> #include <QtGui/QGuiApplication> diff --git a/src/platformheaders/helper/helper.pri b/src/platformheaders/helper/helper.pri index 2f6e766214..10914f9e5e 100644 --- a/src/platformheaders/helper/helper.pri +++ b/src/platformheaders/helper/helper.pri @@ -1,2 +1,2 @@ HEADERS += \ - $$PWD/qplatformheaderhelper.h + $$PWD/qplatformheaderhelper_p.h diff --git a/src/platformheaders/helper/qplatformheaderhelper.h b/src/platformheaders/helper/qplatformheaderhelper_p.h index 6959d889ae..54567667f6 100644 --- a/src/platformheaders/helper/qplatformheaderhelper.h +++ b/src/platformheaders/helper/qplatformheaderhelper_p.h @@ -40,6 +40,17 @@ #ifndef QPLATFORMHEADERHELPER_H #define QPLATFORMHEADERHELPER_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QByteArray> #include <QtGui/QGuiApplication> diff --git a/src/platformheaders/linuxfbfunctions/linuxfbfunctions.pri b/src/platformheaders/linuxfbfunctions/linuxfbfunctions.pri index 8a092c3049..dd18d6c0bb 100644 --- a/src/platformheaders/linuxfbfunctions/linuxfbfunctions.pri +++ b/src/platformheaders/linuxfbfunctions/linuxfbfunctions.pri @@ -1 +1 @@ -HEADERS += $$PWD/qlinuxfbfunctions.h +HEADERS += $$PWD/qlinuxfbfunctions_p.h diff --git a/src/platformheaders/linuxfbfunctions/qlinuxfbfunctions.h b/src/platformheaders/linuxfbfunctions/qlinuxfbfunctions_p.h index 94c4c24270..74e5187282 100644 --- a/src/platformheaders/linuxfbfunctions/qlinuxfbfunctions.h +++ b/src/platformheaders/linuxfbfunctions/qlinuxfbfunctions_p.h @@ -40,6 +40,17 @@ #ifndef QLINUXFBFUNCTIONS_H #define QLINUXFBFUNCTIONS_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QByteArray> #include <QtGui/QGuiApplication> diff --git a/src/platformheaders/platformheaders.pro b/src/platformheaders/platformheaders.pro index 22d1655c77..867f71a4bb 100644 --- a/src/platformheaders/platformheaders.pro +++ b/src/platformheaders/platformheaders.pro @@ -1,7 +1,5 @@ -# Only headers here, no library is wanted. -TEMPLATE = subdirs -VERSION = $$MODULE_VERSION -MODULE_INCNAME = QtPlatformHeaders +TARGET = QtPlatformHeaders +CONFIG += header_module include(xcbfunctions/xcbfunctions.pri) include(eglfsfunctions/eglfsfunctions.pri) @@ -13,6 +11,4 @@ include(linuxfbfunctions/linuxfbfunctions.pri) QMAKE_DOCS = $$PWD/doc/qtplatformheaders.qdocconf -load(qt_module_headers) -load(qt_docs) -load(qt_installs) +load(qt_module) diff --git a/src/platformheaders/waylandfunctions/qwaylandwindowfunctions.h b/src/platformheaders/waylandfunctions/qwaylandwindowfunctions_p.h index 9c2e5f2a14..6d4060daa1 100644 --- a/src/platformheaders/waylandfunctions/qwaylandwindowfunctions.h +++ b/src/platformheaders/waylandfunctions/qwaylandwindowfunctions_p.h @@ -40,6 +40,17 @@ #ifndef QWAYLANDWINDOWFUNCTIONS_H #define QWAYLANDWINDOWFUNCTIONS_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QByteArray> #include <QtGui/QGuiApplication> diff --git a/src/platformheaders/waylandfunctions/waylandfunctions.pri b/src/platformheaders/waylandfunctions/waylandfunctions.pri index 202df907e5..ec612d6418 100644 --- a/src/platformheaders/waylandfunctions/waylandfunctions.pri +++ b/src/platformheaders/waylandfunctions/waylandfunctions.pri @@ -1 +1 @@ -HEADERS += $$PWD/qwaylandwindowfunctions.h +HEADERS += $$PWD/qwaylandwindowfunctions_p.h diff --git a/src/platformheaders/windowsfunctions/qwindowswindowfunctions.h b/src/platformheaders/windowsfunctions/qwindowswindowfunctions_p.h index 722f640a13..5e8881fc87 100644 --- a/src/platformheaders/windowsfunctions/qwindowswindowfunctions.h +++ b/src/platformheaders/windowsfunctions/qwindowswindowfunctions_p.h @@ -40,6 +40,17 @@ #ifndef QWINDOWSWINDOWFUNCTIONS_H #define QWINDOWSWINDOWFUNCTIONS_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QByteArray> #include <QtGui/QGuiApplication> diff --git a/src/platformheaders/windowsfunctions/windowsfunctions.pri b/src/platformheaders/windowsfunctions/windowsfunctions.pri index 479245db80..ee11b9c2b0 100644 --- a/src/platformheaders/windowsfunctions/windowsfunctions.pri +++ b/src/platformheaders/windowsfunctions/windowsfunctions.pri @@ -1 +1 @@ -HEADERS += $$PWD/qwindowswindowfunctions.h +HEADERS += $$PWD/qwindowswindowfunctions_p.h diff --git a/src/platformheaders/xcbfunctions/qxcbscreenfunctions.h b/src/platformheaders/xcbfunctions/qxcbscreenfunctions_p.h index 99624bd5d6..f040701941 100644 --- a/src/platformheaders/xcbfunctions/qxcbscreenfunctions.h +++ b/src/platformheaders/xcbfunctions/qxcbscreenfunctions_p.h @@ -40,7 +40,18 @@ #ifndef QXCBSCREENFUNCTIONS_H #define QXCBSCREENFUNCTIONS_H -#include <QtPlatformHeaders/QPlatformHeaderHelper> +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtPlatformHeaders/private/qplatformheaderhelper_p.h> QT_BEGIN_NAMESPACE diff --git a/src/platformheaders/xcbfunctions/qxcbwindowfunctions.h b/src/platformheaders/xcbfunctions/qxcbwindowfunctions_p.h index b0e6cb6a1d..26b0798fc8 100644 --- a/src/platformheaders/xcbfunctions/qxcbwindowfunctions.h +++ b/src/platformheaders/xcbfunctions/qxcbwindowfunctions_p.h @@ -40,7 +40,18 @@ #ifndef QXCBWINDOWFUNCTIONS_H #define QXCBWINDOWFUNCTIONS_H -#include <QtPlatformHeaders/QPlatformHeaderHelper> +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtPlatformHeaders/private/qplatformheaderhelper_p.h> QT_BEGIN_NAMESPACE diff --git a/src/platformheaders/xcbfunctions/xcbfunctions.pri b/src/platformheaders/xcbfunctions/xcbfunctions.pri index 3fbee53854..5ca2721506 100644 --- a/src/platformheaders/xcbfunctions/xcbfunctions.pri +++ b/src/platformheaders/xcbfunctions/xcbfunctions.pri @@ -1,3 +1,3 @@ HEADERS += \ - $$PWD/qxcbwindowfunctions.h \ - $$PWD/qxcbscreenfunctions.h + $$PWD/qxcbwindowfunctions_p.h \ + $$PWD/qxcbscreenfunctions_p.h |