Skip to content

Commit fd46c4c

Browse files
SjorsSjors
committed
Bump minimum Qt version to 5.5.1
1 parent 7d3f255 commit fd46c4c

File tree

6 files changed

+8
-32
lines changed

6 files changed

+8
-32
lines changed

‎build-aux/m4/bitcoin_qt.m4‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -116,24 +116,6 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
116116
if test "x$bitcoin_cv_static_qt" = xyes; then
117117
_BITCOIN_QT_FIND_STATIC_PLUGINS
118118
AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol if qt plugins are static])
119-
AC_CACHE_CHECK(for Qt < 5.4, bitcoin_cv_need_acc_widget,[
120-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
121-
#include <QtCore/qconfig.h>
122-
#ifndef QT_VERSION
123-
# include <QtCore/qglobal.h>
124-
#endif
125-
]],
126-
[[
127-
#if QT_VERSION >= 0x050400
128-
choke
129-
#endif
130-
]])],
131-
[bitcoin_cv_need_acc_widget=yes],
132-
[bitcoin_cv_need_acc_widget=no])
133-
])
134-
if test "x$bitcoin_cv_need_acc_widget" = xyes; then
135-
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(AccessibleFactory)], [-lqtaccessiblewidgets])
136-
fi
137119
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QMinimalIntegrationPlugin)],[-lqminimal])
138120
AC_DEFINE(QT_QPA_PLATFORM_MINIMAL, 1, [Define this symbol if the minimal qt platform exists])
139121
if test "x$TARGET_OS" = xwindows; then
@@ -264,7 +246,7 @@ dnl All macros below are internal and should _not_ be used from the main
264246
dnl configure.ac.
265247
dnl ----
266248
267-
dnl Internal. Check if the included version of Qt is Qt5.
249+
dnl Internal. Check included version of Qt against minimum specified in doc/dependencies.md
268250
dnl Requires: INCLUDES must be populated as necessary.
269251
dnl Output: bitcoin_cv_qt5=yes|no
270252
AC_DEFUN([_BITCOIN_QT_CHECK_QT5],[
@@ -276,7 +258,7 @@ AC_DEFUN([_BITCOIN_QT_CHECK_QT5],[
276258
#endif
277259
]],
278260
[[
279-
#if QT_VERSION < 0x050200 || QT_VERSION_MAJOR < 5
261+
#if QT_VERSION < 0x050501
280262
choke
281263
#endif
282264
]])],
@@ -374,9 +356,7 @@ AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[
374356
fi
375357
if test "x$TARGET_OS" = xlinux; then
376358
PKG_CHECK_MODULES([X11XCB], [x11-xcb], [QT_LIBS="$X11XCB_LIBS $QT_LIBS"])
377-
if ${PKG_CONFIG} --exists "Qt5Core >= 5.5" 2>/dev/null; then
378-
PKG_CHECK_MODULES([QTXCBQPA], [Qt5XcbQpa], [QT_LIBS="$QTXCBQPA_LIBS $QT_LIBS"])
379-
fi
359+
PKG_CHECK_MODULES([QTXCBQPA], [Qt5XcbQpa], [QT_LIBS="$QTXCBQPA_LIBS $QT_LIBS"])
380360
elif test "x$TARGET_OS" = xdarwin; then
381361
PKG_CHECK_MODULES([QTCLIPBOARD], [Qt5ClipboardSupport], [QT_LIBS="-lQt5ClipboardSupport $QT_LIBS"])
382362
PKG_CHECK_MODULES([QTGRAPHICS], [Qt5GraphicsSupport], [QT_LIBS="-lQt5GraphicsSupport $QT_LIBS"])
@@ -527,4 +507,3 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[
527507
CXXFLAGS="$TEMP_CXXFLAGS"
528508
LIBS="$TEMP_LIBS"
529509
])
530-

‎doc/dependencies.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ These are the dependencies currently used by Bitcoin Core. You can find instruct
2323
| protobuf | [2.6.1](https://github.com/google/protobuf/releases) | | No | | |
2424
| Python (tests) | | [3.4](https://www.python.org/downloads) | | | |
2525
| qrencode | [3.4.4](https://fukuchi.org/works/qrencode) | | No | | |
26-
| Qt | [5.9.7](https://download.qt.io/official_releases/qt/) | [5.2](https://github.com/bitcoin/bitcoin/pull/14725) | No | | |
26+
| Qt | [5.9.7](https://download.qt.io/official_releases/qt/) | [5.5.1](https://github.com/bitcoin/bitcoin/issues/13478) | No | | |
2727
| XCB | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L87) (Linux only) |
2828
| xkbcommon | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L86) (Linux only) |
2929
| ZeroMQ | [4.3.1](https://github.com/zeromq/libzmq/releases) | 4.0.0 | No | | |

‎doc/release-notes-15393.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Dependencies
2+
------------
3+
4+
- The minimum required version of QT has been increased from 5.2 to 5.5.1 (the [depends system](https://github.com/bitcoin/bitcoin/blob/master/depends/README.md) provides 5.9.7)

‎src/qt/bitcoin.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@
5555

5656
#if defined(QT_STATICPLUGIN)
5757
#include <QtPlugin>
58-
#if QT_VERSION < 0x050400
59-
Q_IMPORT_PLUGIN(AccessibleFactory)
60-
#endif
6158
#if defined(QT_QPA_PLATFORM_XCB)
6259
Q_IMPORT_PLUGIN(QXcbIntegrationPlugin);
6360
#elif defined(QT_QPA_PLATFORM_WINDOWS)

‎src/qt/test/apptests.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727
#include <QTest>
2828
#include <QTextEdit>
2929
#include <QtGlobal>
30-
#if QT_VERSION >= 0x050000
3130
#include <QtTest/QtTestWidgets>
32-
#endif
3331
#include <QtTest/QtTestGui>
3432
#include <new>
3533
#include <string>

‎src/qt/test/rpcnestedtests.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ void RPCNestedTests::rpcNestedTests()
120120
RPCConsole::RPCExecuteCommandLine(*node, result, "rpcNestedTest( abc , cba )");
121121
QVERIFY(result == "[\"abc\",\"cba\"]");
122122

123-
#if QT_VERSION >= 0x050300
124123
// do the QVERIFY_EXCEPTION_THROWN checks only with Qt5.3 and higher (QVERIFY_EXCEPTION_THROWN was introduced in Qt5.3)
125124
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(*node, result, "getblockchaininfo() .\n"), std::runtime_error); //invalid syntax
126125
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(*node, result, "getblockchaininfo() getblockchaininfo()"), std::runtime_error); //invalid syntax
@@ -131,5 +130,4 @@ void RPCNestedTests::rpcNestedTests()
131130
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(*node, result, "rpcNestedTest abc,,abc"), std::runtime_error); //don't tollerate empty arguments when using ,
132131
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(*node, result, "rpcNestedTest(abc,,abc)"), std::runtime_error); //don't tollerate empty arguments when using ,
133132
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(*node, result, "rpcNestedTest(abc,,)"), std::runtime_error); //don't tollerate empty arguments when using ,
134-
#endif
135133
}

0 commit comments

Comments
 (0)