diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-06-13 09:22:58 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-06-13 17:58:22 -0700 |
| commit | 246f17d47061b61f3ad9a1711568767ed2254a9b (patch) | |
| tree | 39acdb8a4d7498747ceabf1457b24f640013d6dd /src/widgets/kernel | |
| parent | fb1e0eee078f3f797a72b38e6981348b5ae5810c (diff) | |
QApplication: Remove QApplicationPrivateBase porting macro
This was last used in 2011, before Qt 5.0 release, when QPA was yet
another windowing system, not the only option.
Change-Id: Ia4a094014ddb48cc9f6dfffd16f83aad1b7109e7
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/widgets/kernel')
| -rw-r--r-- | src/widgets/kernel/qapplication.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/kernel/qapplication_p.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index c0920af760..6f680da931 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -112,7 +112,7 @@ QApplicationPrivate *QApplicationPrivate::self = nullptr; bool QApplicationPrivate::autoSipEnabled = true; QApplicationPrivate::QApplicationPrivate(int &argc, char **argv) - : QApplicationPrivateBase(argc, argv) + : QGuiApplicationPrivate(argc, argv) { application_type = QApplicationPrivate::Gui; diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index ee36f44742..197e16afc6 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -58,9 +58,7 @@ extern QClipboard *qt_clipboard; typedef QHash<QByteArray, QFont> FontHash; Q_WIDGETS_EXPORT FontHash *qt_app_fonts_hash(); -#define QApplicationPrivateBase QGuiApplicationPrivate - -class Q_WIDGETS_EXPORT QApplicationPrivate : public QApplicationPrivateBase +class Q_WIDGETS_EXPORT QApplicationPrivate : public QGuiApplicationPrivate { Q_DECLARE_PUBLIC(QApplication) public: |