summaryrefslogtreecommitdiffstats
path: root/tools/qvfb/qvfbshmem.cpp
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2011-09-10 14:43:04 (GMT)
committeraavit <qt-info@nokia.com>2011-09-10 14:43:04 (GMT)
commitb318fc0800c3081af16a38614b95dd50a82b6bbb (patch)
tree9057e35b5d03ce2b223167b5bc98af681fcb0065 /tools/qvfb/qvfbshmem.cpp
parente78edf97db002d5d8efcfd0c2df283f980d3a432 (diff)
parent2fafbf51d6cd61d073c9f77dffd71864e9686de6 (diff)
downloadQt-b318fc0800c3081af16a38614b95dd50a82b6bbb.zip
Qt-b318fc0800c3081af16a38614b95dd50a82b6bbb.tar.gz
Qt-b318fc0800c3081af16a38614b95dd50a82b6bbb.tar.bz2
Merge remote-tracking branch 'qt-fire-review/master'
Diffstat (limited to 'tools/qvfb/qvfbshmem.cpp')
-rw-r--r--tools/qvfb/qvfbshmem.cpp7
1 files changed, 4 insertions, 3 deletions
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>