summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorPasi Petäjäjärvi <pasi.petajajarvi@digia.com>2012-02-27 10:16:41 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-03-15 14:12:55 (GMT)
commit1118f1cf0d74171f63c87635d3c0b53ea79a92dc (patch)
treeb582b1b35579f680943c4208f8ab06f010158dfe /tools
parent32d8106d46fd3fdd765b3685048fc4f46de3626c (diff)
downloadQt-1118f1cf0d74171f63c87635d3c0b53ea79a92dc.zip
Qt-1118f1cf0d74171f63c87635d3c0b53ea79a92dc.tar.gz
Qt-1118f1cf0d74171f63c87635d3c0b53ea79a92dc.tar.bz2
Fix compiling qvfb on Linux/X11
Qvfb fails to compile on linux. Fixed by removing duplicate source and header file inclusion from qvfb.pro file when embedded flag is not set in CONFIG. Task-number: QTBUG-19804 Change-Id: I09278c8042204f913ca2c2bbdee4d4163fae213d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'tools')
-rw-r--r--tools/qvfb/qvfb.pro2
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/qvfb/qvfb.pro b/tools/qvfb/qvfb.pro
index ca8f4f4..dd116a5 100644
--- a/tools/qvfb/qvfb.pro
+++ b/tools/qvfb/qvfb.pro
@@ -38,8 +38,6 @@ SOURCES = qvfb.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)