summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qapplication.cpp3
-rw-r--r--src/gui/kernel/qapplication_lite.cpp8
-rw-r--r--src/gui/kernel/qapplication_p.h1
3 files changed, 3 insertions, 9 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 6dbb7f2..5b294cc 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -812,9 +812,6 @@ void QApplicationPrivate::construct(
if (qt_is_gui_used)
qt_guiPlatformPlugin();
#endif
-#ifdef Q_WS_LITE
- QApplicationPrivate::qapp_constructed = true;
-#endif
}
#if defined(Q_WS_X11)
diff --git a/src/gui/kernel/qapplication_lite.cpp b/src/gui/kernel/qapplication_lite.cpp
index 2b94102..792b28b 100644
--- a/src/gui/kernel/qapplication_lite.cpp
+++ b/src/gui/kernel/qapplication_lite.cpp
@@ -86,8 +86,6 @@ static int mousePressX;
static int mousePressY;
static int mouse_double_click_distance = 5;
-bool QApplicationPrivate::qapp_constructed = false; // QApplication::QApplication completed?
-
void QApplicationPrivate::processUserEvent(QWindowSystemInterface::UserEvent *e)
{
switch(e->type) {
@@ -833,7 +831,7 @@ void QApplicationPrivate::processTouchEvent(QWindowSystemInterface::TouchEvent *
void QApplicationPrivate::reportScreenCount(int count)
{
// This operation only makes sense after the QApplication constructor runs
- if (!QApplicationPrivate::qapp_constructed)
+ if (QCoreApplication::startingUp())
return;
// signal anything listening for creation or deletion of screens
@@ -844,7 +842,7 @@ void QApplicationPrivate::reportScreenCount(int count)
void QApplicationPrivate::reportGeometryChange(int screenIndex)
{
// This operation only makes sense after the QApplication constructor runs
- if (!QApplicationPrivate::qapp_constructed)
+ if (QCoreApplication::startingUp())
return;
// signal anything listening for screen geometry changes
@@ -865,7 +863,7 @@ void QApplicationPrivate::reportGeometryChange(int screenIndex)
void QApplicationPrivate::reportAvailableGeometryChange(int screenIndex)
{
// This operation only makes sense after the QApplication constructor runs
- if (!QApplicationPrivate::qapp_constructed)
+ if (QCoreApplication::startingUp())
return;
// signal anything listening for screen geometry changes
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index 58128c8..e272a36 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -428,7 +428,6 @@ public:
static QString graphics_system_name;
#if defined(Q_WS_LITE)
static QPlatformIntegration *platform_integration;
- static bool qapp_constructed;
#endif
private: