diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-25 10:22:45 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-25 10:22:45 +0200 |
| commit | c5a3e9af4e89aca4e236328d7ad15532ce7ca65a (patch) | |
| tree | dd899822c15e7274fd8914159a6c25b234379135 | |
| parent | 6f8315099503c6b320a514487ed9802484d3f5d0 (diff) | |
| parent | acae229348b8acd995a9deb3f8066f78fb06470e (diff) | |
Merge remote-tracking branch 'origin/stable' into 5.3
Change-Id: I222b3d468acbf45b1f7b81706e74db8c182869cd
| -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> |