diff options
| author | Richard Moe Gustavsen <richard.gustavsen@digia.com> | 2013-08-06 14:48:51 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-07 11:17:44 +0200 |
| commit | 4303cf981aad09950d3e50c408b69caac32f3321 (patch) | |
| tree | ec875117c83c1ce2ba564135eb60353c595c5c86 /src | |
| parent | 8783de7f082c7a60821127ed8964884bae31a817 (diff) | |
Build fix for 10.6
Applied patch pointed to from QTBUG-31363 that ensures that
we include system headers before Qt/project headers.
Task-number: QTBUG-31363
Change-Id: I1aae10c9be0337aab8f84044e2fcfe04e1e75c41
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/macextras/qmacfunctions.mm | 4 | ||||
| -rw-r--r-- | src/macextras/qmacfunctions_mac.mm | 2 | ||||
| -rw-r--r-- | src/macextras/qmacnativetoolbar.mm | 2 | ||||
| -rw-r--r-- | src/macextras/qmacnativewidget.mm | 2 | ||||
| -rw-r--r-- | src/macextras/qmacpasteboardmime.mm | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/src/macextras/qmacfunctions.mm b/src/macextras/qmacfunctions.mm index ba0e940..3d36c0f 100644 --- a/src/macextras/qmacfunctions.mm +++ b/src/macextras/qmacfunctions.mm @@ -45,7 +45,9 @@ #include <QPixmap> #include <QUrl> #import <Foundation/Foundation.h> -#import <CoreGraphics/CoreGraphics.h> +#ifdef Q_OS_IOS + #import <CoreGraphics/CoreGraphics.h> +#endif QT_BEGIN_NAMESPACE diff --git a/src/macextras/qmacfunctions_mac.mm b/src/macextras/qmacfunctions_mac.mm index 05fc783..62949d3 100644 --- a/src/macextras/qmacfunctions_mac.mm +++ b/src/macextras/qmacfunctions_mac.mm @@ -39,9 +39,9 @@ ** ****************************************************************************/ +#import <Cocoa/Cocoa.h> #include "qmacfunctions.h" #include "qmacfunctions_p.h" -#import <Cocoa/Cocoa.h> #if QT_VERSION > QT_VERSION_CHECK(5, 0, 0) #include <QtGui/QWindow> diff --git a/src/macextras/qmacnativetoolbar.mm b/src/macextras/qmacnativetoolbar.mm index d82de0a..e7d9fb3 100644 --- a/src/macextras/qmacnativetoolbar.mm +++ b/src/macextras/qmacnativetoolbar.mm @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#import <AppKit/AppKit.h> #include "qmacfunctions.h" #include "qmacnativetoolbar.h" #include "qmactoolbardelegate.h" @@ -58,7 +59,6 @@ #include <QMainWindow> #endif -#import <AppKit/AppKit.h> // from the Apple NSToolbar documentation #define kNSToolbarIconSizeSmall 24 diff --git a/src/macextras/qmacnativewidget.mm b/src/macextras/qmacnativewidget.mm index b9963ab..305de86 100644 --- a/src/macextras/qmacnativewidget.mm +++ b/src/macextras/qmacnativewidget.mm @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#import <Cocoa/Cocoa.h> #include "qmacnativewidget.h" #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) #include <QtGui/QWindow> @@ -47,7 +48,6 @@ #endif #include <qdebug.h> -#import <Cocoa/Cocoa.h> /*! \class QMacNativeWidget diff --git a/src/macextras/qmacpasteboardmime.mm b/src/macextras/qmacpasteboardmime.mm index 777e514..1ad437a 100644 --- a/src/macextras/qmacpasteboardmime.mm +++ b/src/macextras/qmacpasteboardmime.mm @@ -39,12 +39,12 @@ ** ****************************************************************************/ +#include <Cocoa/Cocoa.h> #include "qmacpasteboardmime.h" #include <qpa/qplatformnativeinterface.h> #include <qapplication.h> #include <qlogging.h> -#include <Cocoa/Cocoa.h> QT_BEGIN_NAMESPACE |