summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan <IanFromAfrica@yahoo.co.uk>2011-06-08 10:41:11 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2011-06-20 06:06:54 (GMT)
commit2c86d4a8685efada1bd4905b0b2e49a82ab24b75 (patch)
treef7c0dc80d84904a6ea5c2e5f021c0f7b88811877
parent6d1bb2792df9bf16c0388e315f25e37308eec337 (diff)
downloadQt-2c86d4a8685efada1bd4905b0b2e49a82ab24b75.zip
Qt-2c86d4a8685efada1bd4905b0b2e49a82ab24b75.tar.gz
Qt-2c86d4a8685efada1bd4905b0b2e49a82ab24b75.tar.bz2
Make it possible to compile in a screen plugin name in QWS
Reviewed-by: Jørgen Lind
-rw-r--r--src/gui/kernel/qapplication_qws.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_qws.cpp b/src/gui/kernel/qapplication_qws.cpp
index 1197c77..abee361 100644
--- a/src/gui/kernel/qapplication_qws.cpp
+++ b/src/gui/kernel/qapplication_qws.cpp
@@ -2184,6 +2184,11 @@ void qt_init(QApplicationPrivate *priv, int type)
qws_screen_is_interlaced = read_bool_env_var("QWS_INTERLACE",false);
const char *display = ::getenv("QWS_DISPLAY");
+
+#ifdef QT_QWS_DEFAULT_DRIVER_NAME
+ if (!display) display = QT_QWS_DEFAULT_DRIVER_NAME;
+#endif
+
if (display)
qws_display_spec = display; // since we setenv later!