Commit ceaca125 authored by Thibaut ROMAIN's avatar Thibaut ROMAIN
Browse files

ENH: Update QT5 to 5.15.2

parent 67f82674
......@@ -134,8 +134,8 @@ configure_file( ${QT5_CONFIGURE_COMMAND_IN} ${QT5_CONFIGURE_COMMAND} @ONLY )
ExternalProject_Add(QT5
PREFIX QT5
URL "https://ftp.osuosl.org/pub/blfs/conglomeration/qt5/qt-everywhere-src-5.11.3.tar.xz"
URL_MD5 02b353bfe7a40a8dc4274e1d17226d2b
URL "http://master.qt.io/archive/qt/5.15/5.15.2/single/qt-everywhere-src-5.15.2.tar.xz"
URL_MD5 e1447db4f06c841d8947f0a6ce83a7b5
BINARY_DIR ${QT5_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
......
--- qt-everywhere-src-5.10.1/qtbase/src/gui/configure.json 2018-02-08 19:24:48.000000000 +0100
--- qt-everywhere-src-5.15.2/qtbase/src/gui/configure.json 2018-02-08 19:24:48.000000000 +0100
+++ QT5/src/QT5/qtbase/src/gui/configure.json 2018-04-10 14:34:05.529668610 +0200
@@ -158,8 +158,8 @@
]
@@ -238,8 +238,8 @@
},
"headers": "ft2build.h",
"sources": [
- { "type": "pkgConfig", "args": "freetype2" },
- { "type": "freetype", "libs": "-lfreetype" }
+ { "type": "freetype", "libs": "-lfreetype" },
+ { "type": "pkgConfig", "args": "freetype2" }
]
},
"fontconfig": {
@@ -289,9 +289,9 @@
"main": "(void) png_create_read_struct(PNG_LIBPNG_VER_STRING,0,0,0);"
},
{ "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
+ { "type": "pkgConfig", "args": "freetype2" },
{ "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" },
{ "libs": "-lfreetype" }
],
@@ -397,12 +397,12 @@
"headers": "png.h",
"sources": [
- { "type": "pkgConfig", "args": "libpng" },
+ { "libs": "-lpng", "condition": "!config.msvc" },
{ "libs": "-llibpng16", "condition": "config.msvc" },
{ "libs": "-llibpng", "condition": "config.msvc" },
- { "libs": "-lpng", "condition": "!config.msvc" }
+ { "type": "pkgConfig", "args": "libpng" }
{ "libs": "-lpng16", "condition": "!config.msvc" },
- { "libs": "-lpng", "condition": "!config.msvc" },
+ { "type": "pkgConfig", "args": "libpng" },
{ "libs": "-s USE_LIBPNG=1", "condition": "config.wasm" }
],
"use": [
{ "lib": "zlib", "condition": "features.system-zlib" }
......@@ -66,25 +66,12 @@ diff -burN qt-everywhere-src-5.14.1/qttools/src/assistant/assistant/assistant.p
load(qt_app)
--- qt-everywhere-src-5.11.3-orig/qttools/src/assistant/qcollectiongenerator/qcollectiongenerator.pro 2018-11-23 08:41:24.000000000 +0100
+++ qt-everywhere-src-5.11.3/qttools/src/assistant/qcollectiongenerator/qcollectiongenerator.pro 2020-09-04 15:42:48.968480227 +0200
@@ -1,5 +1,8 @@
QT += network help-private
TARGET = qcollectiongenerator
--- qt-everywhere-src-5.11.3-orig/qttools/src/assistant/help/help.pro 2018-11-23 08:41:24.000000000 +0100
+++ qt-everywhere-src-5.11.3/qttools/src/assistant/help/help.pro 2020-09-04 15:48:05.003811338 +0200
@@ -3,4 +3,7 @@
QT = core-private gui widgets sql
QT_PRIVATE = network
+
+LIBS += -lpng
+
SOURCES += ../shared/helpgenerator.cpp \
main.cpp \
../shared/collectionconfiguration.cpp
--- qt-everywhere-src-5.11.3-orig/qttools/src/assistant/qhelpconverter/qhelpconverter.pro 2018-11-23 08:41:24.000000000 +0100
+++ qt-everywhere-src-5.11.3/qttools/src/assistant/qhelpconverter/qhelpconverter.pro 2020-09-04 15:48:05.003811338 +0200
@@ -1,5 +1,7 @@
QT += help widgets
+LIBS += -lpng
+
SOURCES += conversionwizard.cpp \
inputpage.cpp \
generalpage.cpp \
DEFINES += QHELP_LIB
--- a/qtbase/src/corelib/global/qrandom.cpp
+++ b/qtbase/src/corelib/global/qrandom.cpp
@@ -218,6 +218,7 @@ struct QRandomGenerator::SystemGenerator
#endif // Q_OS_WINRT
static SystemGenerator &self();
+ typedef quint32 result_type;
void generate(quint32 *begin, quint32 *end) Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept);
// For std::mersenne_twister_engine implementations that use something
--
2.16.3
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment