From 84ef729aa1de762229c8a5c800cddff1a014fcca Mon Sep 17 00:00:00 2001
From: Philip Kaufmann <phil.kaufmann@t-online.de>
Date: Tue, 23 Jul 2013 08:52:24 +0200
Subject: Bitcoin-Qt: fix QApplication includes to match our include defaults

- move all QApplication includes to top of included Qt headers
- undef our loop macro where it would cause compilation errors otherwise
---
 src/qt/bitcoin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/qt/bitcoin.cpp')

diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index b0c45d686..4e9180b88 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -2,8 +2,6 @@
  * W.J. van der Laan 2011-2012
  */
 
-#include <QApplication>
-
 #include "bitcoingui.h"
 #include "clientmodel.h"
 #include "walletmodel.h"
@@ -17,6 +15,8 @@
 #include "splashscreen.h"
 #include "intro.h"
 
+#undef loop /* Todo: ugh, remove this when the #define loop is gone from util.h */
+#include <QApplication>
 #include <QMessageBox>
 #if QT_VERSION < 0x050000
 #include <QTextCodec>
-- 
cgit v1.2.3