diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-07 09:37:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-07 09:37:21 (GMT) |
| commit | 75ff3f73544653f6828ac979a381f48e055cc3ad (patch) | |
| tree | b88463673e7f928fb32390d63d3a798099a16ef8 /tools | |
| parent | 4c964245ba0b41225de01d2dfdff518070bb76b2 (diff) | |
| parent | 0f9b98736ceedebece6c9cd4ce2e669300f882c7 (diff) | |
| download | Qt-75ff3f73544653f6828ac979a381f48e055cc3ad.zip Qt-75ff3f73544653f6828ac979a381f48e055cc3ad.tar.gz Qt-75ff3f73544653f6828ac979a381f48e055cc3ad.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix build for desktop
Fix the build with -qtnamespace configure options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qvfb/qvfb.pro | 9 | ||||
| -rw-r--r-- | 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> |