summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2012-04-26 12:10:00 (GMT)
committerKevin Smith <git@kismith.co.uk>2012-04-26 12:10:00 (GMT)
commit87736632617b2ebb0f134289444730b68f60e1f7 (patch)
tree52a04263fca73cd31a3d0b7ecdbbc6782c4170a1
parent18e90e662e849cf51d00961613a43f50f5fd864e (diff)
downloadswift-contrib-87736632617b2ebb0f134289444730b68f60e1f7.zip
swift-contrib-87736632617b2ebb0f134289444730b68f60e1f7.tar.bz2
Change include order to work around slot redefinition conflicts
-rw-r--r--Swift/QtUI/CocoaApplicationActivateHelper.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/QtUI/CocoaApplicationActivateHelper.mm b/Swift/QtUI/CocoaApplicationActivateHelper.mm
index 7c42380..2904b20 100644
--- a/Swift/QtUI/CocoaApplicationActivateHelper.mm
+++ b/Swift/QtUI/CocoaApplicationActivateHelper.mm
@@ -4,10 +4,10 @@
* See Documentation/Licenses/GPLv3.txt for more information.
*/
+#include <Cocoa/Cocoa.h>
#include "CocoaApplicationActivateHelper.h"
#include <boost/function.hpp>
-#include <Cocoa/Cocoa.h>
#include <QApplication>
@interface CocoaApplicationActivateHelperDelegate : NSObject {
@@ -51,4 +51,4 @@ bool CocoaApplicationActivateHelper::eventFilter(QObject* object, QEvent* event)
}
-} \ No newline at end of file
+}