From 0f9b98736ceedebece6c9cd4ce2e669300f882c7 Mon Sep 17 00:00:00 2001
From: Konstantin Ritt <ritt.ks@gmail.com>
Date: Wed, 7 Sep 2011 05:16:36 +0400
Subject: fix build for desktop

QTBUG: 20236

Merge-request: 2672
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
---
 tools/qvfb/qvfb.pro      | 9 +++++++++
 tools/qvfb/qvfbshmem.cpp | 6 ++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/tools/qvfb/qvfb.pro b/tools/qvfb/qvfb.pro
index 29ce202..df68c97 100644
--- a/tools/qvfb/qvfb.pro
+++ b/tools/qvfb/qvfb.pro
@@ -8,6 +8,9 @@ DESTDIR         = ../../bin
 target.path=$$[QT_INSTALL_BINS]
 INSTALLS += target
 
+DEPENDPATH      += ../../include
+INCLUDEPATH     += ../../src/gui/embedded
+
 FORMS           = config.ui
 HEADERS         = qvfb.h \
 		  qvfbview.h \
@@ -27,6 +30,12 @@ SOURCES         = qvfb.cpp \
                   qvfbshmem.cpp \
                   qvfbmmap.cpp
 
+!embedded {
+    DEFINES         += QT_NO_QWS_SIGNALHANDLER
+    HEADERS         += ../../src/gui/embedded/qlock_p.h
+    SOURCES         += ../../src/gui/embedded/qlock.cpp
+}
+
 include(../shared/deviceskin/deviceskin.pri)
 
 contains(QT_CONFIG, opengl) {
diff --git a/tools/qvfb/qvfbshmem.cpp b/tools/qvfb/qvfbshmem.cpp
index c17a680..c9a4293 100644
--- a/tools/qvfb/qvfbshmem.cpp
+++ b/tools/qvfb/qvfbshmem.cpp
@@ -39,9 +39,11 @@
 **
 ****************************************************************************/
 
+#include <qplatformdefs.h>
+
 #include "qvfbshmem.h"
-#include <qvfbhdr.h>
-#include <private/qlock_p.h>
+#include "qvfbhdr.h"
+#include "qlock_p.h"
 
 #include <QFile>
 #include <QTimer>
-- 
cgit v0.12