diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:24:53 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:24:53 +0200 |
| commit | 54bf1e9fb79d64dc6d2f4a9bcb1c76445293e538 (patch) | |
| tree | b9b8cb838446ade441d42026389b920a37dbb0c1 | |
| parent | b05a002177f575b8d6ed20a046ec856adb95f6ac (diff) | |
| parent | c5a3e9af4e89aca4e236328d7ad15532ce7ca65a (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: I1db80f61bc3e6314f897352108896adbe49e0f72
| -rw-r--r-- | src/macextras/qmacfunctions.h | 2 | ||||
| -rw-r--r-- | src/macextras/qmacpasteboardmime.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/macextras/qmacfunctions.h b/src/macextras/qmacfunctions.h index cf7cc2a..74a0c86 100644 --- a/src/macextras/qmacfunctions.h +++ b/src/macextras/qmacfunctions.h @@ -46,7 +46,7 @@ #pragma qt_class(QtMac) #endif -#include "qmacextrasglobal.h" +#include "QtMacExtras/qmacextrasglobal.h" typedef struct CGImage *CGImageRef; typedef struct CGContext *CGContextRef; diff --git a/src/macextras/qmacpasteboardmime.h b/src/macextras/qmacpasteboardmime.h index d0dda6c..9a107ae 100644 --- a/src/macextras/qmacpasteboardmime.h +++ b/src/macextras/qmacpasteboardmime.h @@ -42,7 +42,7 @@ #if !defined(QMACMIME_H) && !defined(QMIME_H) #define QMACMIME_H -#include "qmacextrasglobal.h" +#include "QtMacExtras/qmacextrasglobal.h" #include <QtCore> |