Merge remote-tracking branch 'origin/stable-1.0' into stable-1.1

This commit is contained in:
Tobias Doerffel
2014-06-21 23:29:32 +02:00
99 changed files with 1240 additions and 833 deletions

View File

@@ -52,7 +52,7 @@
#include <process.h>
#endif
#include <Qt/qglobal.h>
#include <QtCore/QtGlobal>
#if QT_VERSION >= 0x040400
#include <QtCore/QSystemSemaphore>
@@ -75,7 +75,7 @@
#ifdef USE_QT_SHMEM
#include <Qt/qglobal.h>
#include <QtCore/QtGlobal>
#if QT_VERSION >= 0x040400
#include <QtCore/QSharedMemory>