diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-08-15 17:31:26 +0200 |
---|---|---|
committer | MeshCollider <dobsonsa68@gmail.com> | 2017-11-16 08:23:02 +1300 |
commit | e7b31631c78a8fc021336c7ecda44f6bc4b4b1f1 (patch) | |
tree | 9a6311c49c6fb23c7dc2f0622b0b3b65cd336374 /src/qt/test | |
parent | 0c715214dd2d03b66a366a87bf6d2c576c0176c2 (diff) | |
download | bitcoin-e7b31631c78a8fc021336c7ecda44f6bc4b4b1f1.tar.xz |
qt: refactor: Changes to make include paths absolute
This makes all include paths in the GUI absolute.
Many changes are involved as every single source file in
src/qt/ assumes to be able to use relative includes.
Diffstat (limited to 'src/qt/test')
-rw-r--r-- | src/qt/test/compattests.cpp | 2 | ||||
-rw-r--r-- | src/qt/test/paymentservertests.cpp | 2 | ||||
-rw-r--r-- | src/qt/test/paymentservertests.h | 2 | ||||
-rw-r--r-- | src/qt/test/rpcnestedtests.cpp | 2 | ||||
-rw-r--r-- | src/qt/test/uritests.cpp | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/qt/test/compattests.cpp b/src/qt/test/compattests.cpp index c22e1973a6..7a4388e940 100644 --- a/src/qt/test/compattests.cpp +++ b/src/qt/test/compattests.cpp @@ -2,7 +2,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include <paymentrequestplus.h> // this includes protobuf's port.h which defines its own bswap macos +#include <qt/paymentrequestplus.h> // this includes protobuf's port.h which defines its own bswap macos #include <qt/test/compattests.h> diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp index 7aaaccaa9e..1864604372 100644 --- a/src/qt/test/paymentservertests.cpp +++ b/src/qt/test/paymentservertests.cpp @@ -4,7 +4,7 @@ #include <qt/test/paymentservertests.h> -#include <optionsmodel.h> +#include <qt/optionsmodel.h> #include <qt/test/paymentrequestdata.h> #include <amount.h> diff --git a/src/qt/test/paymentservertests.h b/src/qt/test/paymentservertests.h index f1dbeae366..6d84c38287 100644 --- a/src/qt/test/paymentservertests.h +++ b/src/qt/test/paymentservertests.h @@ -5,7 +5,7 @@ #ifndef BITCOIN_QT_TEST_PAYMENTSERVERTESTS_H #define BITCOIN_QT_TEST_PAYMENTSERVERTESTS_H -#include <qt/test/../paymentserver.h> +#include <qt/paymentserver.h> #include <QObject> #include <QTest> diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp index 2f692af2d2..0596ccf90e 100644 --- a/src/qt/test/rpcnestedtests.cpp +++ b/src/qt/test/rpcnestedtests.cpp @@ -10,7 +10,7 @@ #include <validation.h> #include <rpc/register.h> #include <rpc/server.h> -#include <rpcconsole.h> +#include <qt/rpcconsole.h> #include <test/test_bitcoin.h> #include <univalue.h> #include <util.h> diff --git a/src/qt/test/uritests.cpp b/src/qt/test/uritests.cpp index e11807d551..e47aa8b546 100644 --- a/src/qt/test/uritests.cpp +++ b/src/qt/test/uritests.cpp @@ -4,8 +4,8 @@ #include <qt/test/uritests.h> -#include <guiutil.h> -#include <walletmodel.h> +#include <qt/guiutil.h> +#include <qt/walletmodel.h> #include <QUrl> |