diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-07-25 22:42:16 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-07-25 22:42:16 -0700 |
| commit | 2b894bceac90af4500403b510488d5821548cd45 (patch) | |
| tree | 4aeef97de6fc9da2f71c1d02dd44264a0953b003 /src/qt/paymentserver.cpp | |
| parent | 7d3a50ddbedc45a397f1ca892daecc809e6c9866 (diff) | |
| parent | 84ef729aa1de762229c8a5c800cddff1a014fcca (diff) | |
| download | bitcoin-2b894bceac90af4500403b510488d5821548cd45.tar.xz | |
Merge pull request #2847 from Diapolo/fix_QApplication_include
Bitcoin-Qt: fix QApplication includes to match our include defaults
Diffstat (limited to 'src/qt/paymentserver.cpp')
| -rw-r--r-- | src/qt/paymentserver.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 0b0bce55bb..8178065bcc 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -2,14 +2,14 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include <QApplication> - #include "paymentserver.h" #include "guiconstants.h" #include "ui_interface.h" #include "util.h" +#undef loop /* Todo: ugh, remove this when the #define loop is gone from util.h */ +#include <QApplication> #include <QByteArray> #include <QDataStream> #include <QDebug> |