diff options
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 22 | ||||
| -rw-r--r-- | src/gui/kernel/qapplication_p.h | 6 |
2 files changed, 15 insertions, 13 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 13162800ac..f37e8d9759 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -172,7 +172,7 @@ bool QApplicationPrivate::autoSipEnabled = true; #endif QApplicationPrivate::QApplicationPrivate(int &argc, char **argv, QApplication::Type type, int flags) - : QGuiApplicationPrivate(argc, argv, flags) + : QApplicationPrivateBase(argc, argv, flags) { application_type = type; qt_appType = type; @@ -728,11 +728,11 @@ void QApplicationPrivate::process_cmdline() */ QApplication::QApplication(int &argc, char **argv) - : QGuiApplication(*new QApplicationPrivate(argc, argv, GuiClient, 0x040000)) + : QApplicationBase(*new QApplicationPrivate(argc, argv, GuiClient, 0x040000)) { Q_D(QApplication); d->construct(); } QApplication::QApplication(int &argc, char **argv, int _internal) - : QGuiApplication(*new QApplicationPrivate(argc, argv, GuiClient, _internal)) + : QApplicationBase(*new QApplicationPrivate(argc, argv, GuiClient, _internal)) { Q_D(QApplication); d->construct(); } @@ -762,11 +762,11 @@ QApplication::QApplication(int &argc, char **argv, int _internal) */ QApplication::QApplication(int &argc, char **argv, bool GUIenabled ) - : QGuiApplication(*new QApplicationPrivate(argc, argv, GUIenabled ? GuiClient : Tty, 0x040000)) + : QApplicationBase(*new QApplicationPrivate(argc, argv, GUIenabled ? GuiClient : Tty, 0x040000)) { Q_D(QApplication); d->construct(); } QApplication::QApplication(int &argc, char **argv, bool GUIenabled , int _internal) - : QGuiApplication(*new QApplicationPrivate(argc, argv, GUIenabled ? GuiClient : Tty, _internal)) + : QApplicationBase(*new QApplicationPrivate(argc, argv, GUIenabled ? GuiClient : Tty, _internal)) { Q_D(QApplication); d->construct();} @@ -785,11 +785,11 @@ QApplication::QApplication(int &argc, char **argv, bool GUIenabled , int _intern \c -qws option). */ QApplication::QApplication(int &argc, char **argv, Type type) - : QGuiApplication(*new QApplicationPrivate(argc, argv, type, 0x040000)) + : QApplicationBase(*new QApplicationPrivate(argc, argv, type, 0x040000)) { Q_D(QApplication); d->construct(); } QApplication::QApplication(int &argc, char **argv, Type type , int _internal) - : QGuiApplication(*new QApplicationPrivate(argc, argv, type, _internal)) + : QApplicationBase(*new QApplicationPrivate(argc, argv, type, _internal)) { Q_D(QApplication); d->construct(); } #if defined(Q_WS_X11) && !defined(QT_NO_EGL) @@ -896,7 +896,7 @@ static char *aargv[] = { (char*)"unknown", 0 }; This function is only available on X11. */ QApplication::QApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE colormap) - : QGuiApplication(*new QApplicationPrivate(aargc, aargv, GuiClient, 0x040000)) + : QApplicationBase(*new QApplicationPrivate(aargc, aargv, GuiClient, 0x040000)) { if (! dpy) qWarning("QApplication: Invalid Display* argument"); @@ -905,7 +905,7 @@ QApplication::QApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE colormap) } QApplication::QApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE colormap, int _internal) - : QGuiApplication(*new QApplicationPrivate(aargc, aargv, GuiClient, _internal)) + : QApplicationBase(*new QApplicationPrivate(aargc, aargv, GuiClient, _internal)) { if (! dpy) qWarning("QApplication: Invalid Display* argument"); @@ -930,7 +930,7 @@ QApplication::QApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE colormap, */ QApplication::QApplication(Display *dpy, int &argc, char **argv, Qt::HANDLE visual, Qt::HANDLE colormap) - : QGuiApplication(*new QApplicationPrivate(argc, argv, GuiClient, 0x040000)) + : QApplicationBase(*new QApplicationPrivate(argc, argv, GuiClient, 0x040000)) { if (! dpy) qWarning("QApplication: Invalid Display* argument"); @@ -940,7 +940,7 @@ QApplication::QApplication(Display *dpy, int &argc, char **argv, QApplication::QApplication(Display *dpy, int &argc, char **argv, Qt::HANDLE visual, Qt::HANDLE colormap, int _internal) - : QGuiApplication(*new QApplicationPrivate(argc, argv, GuiClient, _internal)) + : QApplicationBase(*new QApplicationPrivate(argc, argv, GuiClient, _internal)) { if (! dpy) qWarning("QApplication: Invalid Display* argument"); diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index 2b7ec31b73..2617f98c1f 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -296,10 +296,12 @@ typedef QHash<QByteArray, QPalette> PaletteHash; PaletteHash *qt_app_palettes_hash(); #ifdef Q_WS_QPA -class Q_GUI_EXPORT QApplicationPrivate : public QGuiApplicationPrivate +#define QApplicationPrivateBase QGuiApplicationPrivate #else -class Q_GUI_EXPORT QApplicationPrivate : public QCoreApplicationPrivate +#define QApplicationPrivateBase QCoreApplicationPrivate #endif + +class Q_GUI_EXPORT QApplicationPrivate : public QApplicationPrivateBase { Q_DECLARE_PUBLIC(QApplication) public: |