diff options
| author | aavit <qt-info@nokia.com> | 2011-09-08 19:42:31 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-09-08 19:42:31 (GMT) |
| commit | a2c2c71ecd84e90f72697dfd57544c8d506c78e2 (patch) | |
| tree | c5e31ff16e2471d33a124a6a37f4e48acdacd235 /tools/qvfb | |
| parent | 6326227674efa85c1a5320141041110d211efc75 (diff) | |
| parent | 260005374b9b930aa583cd117aba96f8f4b34131 (diff) | |
| download | Qt-a2c2c71ecd84e90f72697dfd57544c8d506c78e2.zip Qt-a2c2c71ecd84e90f72697dfd57544c8d506c78e2.tar.gz Qt-a2c2c71ecd84e90f72697dfd57544c8d506c78e2.tar.bz2 | |
Merge remote-tracking branch 'qt-mainline/4.8'
Conflicts:
tools/qvfb/qvfbshmem.cpp
Diffstat (limited to 'tools/qvfb')
| -rw-r--r-- | tools/qvfb/qvfb.pro | 9 | ||||
| -rw-r--r-- | tools/qvfb/qvfbshmem.cpp | 7 |
2 files changed, 13 insertions, 3 deletions
diff --git a/tools/qvfb/qvfb.pro b/tools/qvfb/qvfb.pro index b5645a3..ca8f4f4 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 \ @@ -33,6 +36,12 @@ SOURCES = qvfb.cpp \ ../../src/gui/embedded/qwslock.cpp \ ../../src/gui/embedded/qwssignalhandler.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 5a9aa7c..c9a4293 100644 --- a/tools/qvfb/qvfbshmem.cpp +++ b/tools/qvfb/qvfbshmem.cpp @@ -39,10 +39,11 @@ ** ****************************************************************************/ -#include "qplatformdefs.h" +#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> |