diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-04 08:45:54 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-04 08:45:54 (GMT) |
| commit | e22581675866cbf88e948eae2e83eb13a43a2d44 (patch) | |
| tree | 782b173b702a48fca5f68d9622cad67d65d01d88 /src/plugins/gfxdrivers/vnc/main.cpp | |
| parent | 950cd9b3c1ae6a1b462d596a62aea92f9c231afb (diff) | |
| parent | db997a02c1d306260d8bbfe4f13e8312efb6fa7c (diff) | |
| download | Qt-e22581675866cbf88e948eae2e83eb13a43a2d44.zip Qt-e22581675866cbf88e948eae2e83eb13a43a2d44.tar.gz Qt-e22581675866cbf88e948eae2e83eb13a43a2d44.tar.bz2 | |
Merge commit 'origin/4.6' into 4.6
Diffstat (limited to 'src/plugins/gfxdrivers/vnc/main.cpp')
| -rw-r--r-- | src/plugins/gfxdrivers/vnc/main.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/gfxdrivers/vnc/main.cpp b/src/plugins/gfxdrivers/vnc/main.cpp index aa20d11..58c8c25 100644 --- a/src/plugins/gfxdrivers/vnc/main.cpp +++ b/src/plugins/gfxdrivers/vnc/main.cpp @@ -43,6 +43,7 @@ #include <qscreenvnc_qws.h> #include <qstringlist.h> +#ifndef QT_NO_LIBRARY QT_BEGIN_NAMESPACE class GfxVncDriver : public QScreenDriverPlugin @@ -68,9 +69,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; } @@ -78,3 +82,5 @@ Q_EXPORT_STATIC_PLUGIN(GfxVncDriver) Q_EXPORT_PLUGIN2(qgfxvnc, GfxVncDriver) QT_END_NAMESPACE + +#endif //QT_NO_LIBRARY |