aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2013-12-18 15:46:48 -0500
committerCory Fields <cory-nospam-@coryfields.com>2014-01-10 16:30:33 -0500
commit8b0f608815aa3de43208d4ac334a11bc4c408167 (patch)
treec706b11d298ed3dc9b4068cf7cb485ec84e301e0
parent47ffb505331b8f6257a6879b02415e604ad85da0 (diff)
downloadbitcoin-8b0f608815aa3de43208d4ac334a11bc4c408167.tar.xz
qt5: tests: Make sure static plugin symbols are pulled in
Since we're now properly linking against static plugins for qt binaries, we need to ensure that they're Imported properly. Without these Imports, the linker drops some of the unused linked libs, causing undefined symbols in QtCore.
-rw-r--r--src/qt/test/test_main.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp
index ae584706f1..ad0dfd9823 100644
--- a/src/qt/test/test_main.cpp
+++ b/src/qt/test/test_main.cpp
@@ -1,3 +1,4 @@
+#include "bitcoin-config.h"
#include "paymentservertests.h"
#include "uritests.h"
@@ -5,6 +6,14 @@
#include <QObject>
#include <QTest>
+#if defined(QT_STATICPLUGIN) && QT_VERSION < 0x050000
+#include <QtPlugin>
+Q_IMPORT_PLUGIN(qcncodecs)
+Q_IMPORT_PLUGIN(qjpcodecs)
+Q_IMPORT_PLUGIN(qtwcodecs)
+Q_IMPORT_PLUGIN(qkrcodecs)
+#endif
+
// This is all you need to run all the tests
int main(int argc, char *argv[])
{