summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2009-10-19 11:55:38 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2009-10-29 16:00:10 (GMT)
commit6eb1faad9511dde6ab31b9a4f75fce0bdfbdc12c (patch)
treebdfea038c1d37340946c3986eb405f9ce48eae44 /src/plugins
parente55810dc838e95c60a275f1ea3be3bb6bb93fb83 (diff)
downloadQt-6eb1faad9511dde6ab31b9a4f75fce0bdfbdc12c.zip
Qt-6eb1faad9511dde6ab31b9a4f75fce0bdfbdc12c.tar.gz
Qt-6eb1faad9511dde6ab31b9a4f75fce0bdfbdc12c.tar.bz2
Fixed MENU and QWS_PROXYSCREEN
Reviewed-by: tom
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/gfxdrivers/transformed/main.cpp5
-rw-r--r--src/plugins/gfxdrivers/vnc/main.cpp5
2 files changed, 8 insertions, 2 deletions
diff --git a/src/plugins/gfxdrivers/transformed/main.cpp b/src/plugins/gfxdrivers/transformed/main.cpp
index 982882e..859fd49 100644
--- a/src/plugins/gfxdrivers/transformed/main.cpp
+++ b/src/plugins/gfxdrivers/transformed/main.cpp
@@ -68,9 +68,12 @@ QStringList GfxTransformedDriver::keys() const
QScreen* GfxTransformedDriver::create(const QString& driver, int displayId)
{
+#ifndef QT_NO_QWS_TRANSFORMED
if (driver.toLower() == "transformed")
return new QTransformedScreen(displayId);
-
+#else //QT_NO_QWS_TRANSFORMED
+ printf("QT buildt with QT_NO_QWS_TRANSFORMED. No screen driver returned\n");
+#endif //QT_NO_QWS_TRANSFORMED
return 0;
}
diff --git a/src/plugins/gfxdrivers/vnc/main.cpp b/src/plugins/gfxdrivers/vnc/main.cpp
index aa20d11..7d91ff5 100644
--- a/src/plugins/gfxdrivers/vnc/main.cpp
+++ b/src/plugins/gfxdrivers/vnc/main.cpp
@@ -68,9 +68,12 @@ QStringList GfxVncDriver::keys() const
QScreen* GfxVncDriver::create(const QString& driver, int displayId)
{
+#ifndef QT_NO_QWS_VNC
if (driver.toLower() == "vnc")
return new QVNCScreen(displayId);
-
+#else //QT_NO_QWS_VNC
+ printf("QT buildt with QT_NO_QWS_VNC. No screen driver returned\n");
+#endif //QT_NO_QWS_VNC
return 0;
}