summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-04-02 14:43:12 +0200
committerSergio Ahumada <sergio.ahumada@digia.com>2013-04-02 14:43:31 +0200
commitdda3f8303b1f2ab4fd53979577a1b7bd3534f4c4 (patch)
treead1a3f01c4b1d4710b921f555d8818d3724cc1a2
parenta43c8f1f4dceb151d5c4d60bc1c5cf34962aa5a2 (diff)
parent799621c0e235d41021b2785b690bfd0d1f44db11 (diff)
downloadqtx11extras-dda3f8303b1f2ab4fd53979577a1b7bd3534f4c4.tar.gz
Merge branch 'stable' into dev
Change-Id: I9aad90d45302154fb831d8ce50dffdd7ae9d8318
-rw-r--r--.qmake.conf2
-rw-r--r--src/x11extras/qx11info_x11.cpp12
2 files changed, 14 insertions, 0 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 42ba8e4..f5a422c 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1 +1,3 @@
load(qt_build_config)
+
+MODULE_VERSION = 5.1.0
diff --git a/src/x11extras/qx11info_x11.cpp b/src/x11extras/qx11info_x11.cpp
index cb534b7..a7499e4 100644
--- a/src/x11extras/qx11info_x11.cpp
+++ b/src/x11extras/qx11info_x11.cpp
@@ -187,6 +187,8 @@ unsigned long QX11Info::appTime()
if (!qApp)
return 0;
QPlatformNativeInterface *native = qApp->platformNativeInterface();
+ if (!native)
+ return 0;
QScreen* screen = QGuiApplication::primaryScreen();
return static_cast<xcb_timestamp_t>(reinterpret_cast<quintptr>(native->nativeResourceForScreen("apptime", screen)));
}
@@ -201,6 +203,8 @@ unsigned long QX11Info::appUserTime()
if (!qApp)
return 0;
QPlatformNativeInterface *native = qApp->platformNativeInterface();
+ if (!native)
+ return 0;
QScreen* screen = QGuiApplication::primaryScreen();
return static_cast<xcb_timestamp_t>(reinterpret_cast<quintptr>(native->nativeResourceForScreen("appusertime", screen)));
}
@@ -215,6 +219,8 @@ void QX11Info::setAppTime(unsigned long time)
if (!qApp)
return;
QPlatformNativeInterface *native = qApp->platformNativeInterface();
+ if (!native)
+ return;
typedef void (*SetAppTimeFunc)(QScreen *, xcb_timestamp_t);
QScreen* screen = QGuiApplication::primaryScreen();
SetAppTimeFunc func = reinterpret_cast<SetAppTimeFunc>(native->nativeResourceFunctionForScreen("setapptime"));
@@ -234,6 +240,8 @@ void QX11Info::setAppUserTime(unsigned long time)
if (!qApp)
return;
QPlatformNativeInterface *native = qApp->platformNativeInterface();
+ if (!native)
+ return;
typedef void (*SetAppUserTimeFunc)(QScreen *, xcb_timestamp_t);
QScreen* screen = QGuiApplication::primaryScreen();
SetAppUserTimeFunc func = reinterpret_cast<SetAppUserTimeFunc>(native->nativeResourceFunctionForScreen("setappusertime"));
@@ -253,6 +261,8 @@ Display *QX11Info::display()
if (!qApp)
return NULL;
QPlatformNativeInterface *native = qApp->platformNativeInterface();
+ if (!native)
+ return NULL;
void *display = native->nativeResourceForScreen(QByteArray("display"), QGuiApplication::primaryScreen());
return reinterpret_cast<Display *>(display);
@@ -268,6 +278,8 @@ xcb_connection_t *QX11Info::connection()
if (!qApp)
return NULL;
QPlatformNativeInterface *native = qApp->platformNativeInterface();
+ if (!native)
+ return NULL;
void *connection = native->nativeResourceForWindow(QByteArray("connection"), 0);
return reinterpret_cast<xcb_connection_t *>(connection);