Commit 1ec8060a authored by Cédric Traizet's avatar Cédric Traizet

REFAC: downgrade qt5 to 5.11 because of compatibility issues with CentOS 6

parent 93727fa2
Pipeline #5668 failed with stages
in 118 minutes and 45 seconds
......@@ -130,8 +130,8 @@ configure_file( ${QT5_CONFIGURE_COMMAND_IN} ${QT5_CONFIGURE_COMMAND} @ONLY )
ExternalProject_Add(QT5
PREFIX QT5
URL "https://download.qt.io/archive/qt/5.14/5.14.1/single/qt-everywhere-src-5.14.1.tar.xz"
URL_MD5 781c3179410aff7ef84607214e1e91b4
URL "https://download.qt.io/new_archive/qt/5.11/5.11.3/single/qt-everywhere-src-5.11.3.tar.xz"
URL_MD5 02b353bfe7a40a8dc4274e1d17226d2b
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
+++ QT5/qtbase/src/gui/configure.json 2018-04-10 11:50:15.631526687 +0200
@@ -278,8 +278,7 @@
"main": "jpeg_create_compress(cinfo);"
},
"sources": [
- { "libs": "-llibjpeg", "condition": "config.msvc" },
- { "libs": "-ljpeg", "condition": "!config.msvc" }
+ { "libs": "-ljpeg" }
]
},
"libpng": {
diff -burN qt-everywhere-src-5.14.1_orig/qtbase/src/gui/configure.json qt-everywhere-src-5.14.1/qtbase/src/gui/configure.json--- qt-everywhere-src-5.14.1_orig/qtbase/src/gui/configure.json 2020-07-27 18:13:35.779000908 +0200
+++ qt-everywhere-src-5.14.1/qtbase/src/gui/configure.json 2020-07-27 18:18:11.226987484 +0200
@@ -239,10 +239,10 @@
--- qt-everywhere-src-5.10.1/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 @@
]
},
"headers": "ft2build.h",
"sources": [
- { "type": "pkgConfig", "args": "freetype2" },
{ "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
{ "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" },
- { "libs": "-lfreetype" }
+ { "libs": "-lfreetype" },
- { "type": "freetype", "libs": "-lfreetype" }
+ { "type": "freetype", "libs": "-lfreetype" },
+ { "type": "pkgConfig", "args": "freetype2" }
],
"use": [
{ "lib": "zlib", "condition": "features.system-zlib" }
@@ -397,12 +397,12 @@
]
},
"fontconfig": {
@@ -289,9 +289,9 @@
"main": "(void) png_create_read_struct(PNG_LIBPNG_VER_STRING,0,0,0);"
},
"headers": "png.h",
"sources": [
- { "type": "pkgConfig", "args": "libpng" },
{ "libs": "-llibpng16", "condition": "config.msvc" },
+ { "libs": "-lpng", "condition": "!config.msvc" },
{ "libs": "-llibpng", "condition": "config.msvc" },
{ "libs": "-lpng16", "condition": "!config.msvc" },
{ "libs": "-lpng", "condition": "!config.msvc" },
- { "libs": "-s USE_LIBPNG=1", "condition": "config.wasm" }
+ { "libs": "-s USE_LIBPNG=1", "condition": "config.wasm" },
- { "libs": "-lpng", "condition": "!config.msvc" }
+ { "type": "pkgConfig", "args": "libpng" }
],
"use": [
......
diff -burN qt-everywhere-src-5.14.1/qttools/src/assistant/assistant/assistant.pro qt-everywhere-src-5.14.1_orig/qttools/src/assistant/assistant/assistant.pro
--- qt-everywhere-src-5.14.1/qttools/src/assistant/assistant/assistant.pro 2020-01-17 06:51:13.000000000 +0100
+++ qt-everywhere-src-5.14.1_orig/qttools/src/assistant/assistant/assistant.pro 2020-08-24 15:19:57.044203325 +0200
@@ -45,6 +45,8 @@
openpagesmanager.h \
openpagesswitcher.h
+LIBS += -lpng
+
SOURCES += aboutdialog.cpp \
bookmarkdialog.cpp \
bookmarkfiltermodel.cpp \
--- qt-everywhere-src-5.14.1/qttools/src/assistant/qhelpgenerator/qhelpgenerator.pro 2020-01-17 06:51:13.000000000 +0100
+++ qt-everywhere-src-5.14.1_orig/qttools/src/assistant/qhelpgenerator/qhelpgenerator.pro 2020-08-24 15:42:12.924236449 +0200
@@ -15,5 +15,7 @@
qhelpprojectdata_p.h \
qhelpdatainterface_p.h
+LIBS += -lpng
+
QMAKE_TARGET_DESCRIPTION = "Qt Compressed Help File Generator"
load(qt_tool)
--- qt-everywhere-src-5.14.1/qttools/src/designer/src/designer/designer.pro 2020-01-17 06:51:13.000000000 +0100
+++ qt-everywhere-src-5.14.1_orig/qttools/src/designer/src/designer/designer.pro 2020-08-24 15:44:13.892239448 +0200
@@ -53,6 +53,8 @@
assistantclient.cpp \
mainwindow.cpp
+LIBS += -lpng
+
PRECOMPILED_HEADER=qdesigner_pch.h
FORMS += saveformastemplate.ui \
--- qt-everywhere-src-5.14.1/qttools/src/pixeltool/pixeltool.pro 2020-01-17 06:51:13.000000000 +0100
+++ qt-everywhere-src-5.14.1_orig/qttools/src/pixeltool/pixeltool.pro 2020-08-24 15:45:42.572241647 +0200
@@ -6,5 +6,6 @@
SOURCES += main.cpp qpixeltool.cpp
HEADERS += qpixeltool.h
+LIBS += -lpng
load(qt_app)
--- qt-everywhere-src-5.14.1/qttools/src/linguist/linguist/linguist.pro 2020-01-17 06:51:13.000000000 +0100
+++ qt-everywhere-src-5.14.1_orig/qttools/src/linguist/linguist/linguist.pro 2020-08-24 15:59:27.476262101 +0200
@@ -55,6 +55,8 @@
translationsettingsdialog.h \
../shared/simtexth.h
+LIBS += -lpng
+
contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
DEFINES += QT_KEYWORDS
TARGET = linguist
--- qt-everywhere-src-5.14.1/qttools/src/qtdiag/qtdiag.pro 2020-01-17 06:51:13.000000000 +0100
+++ qt-everywhere-src-5.14.1_orig/qttools/src/qtdiag/qtdiag.pro 2020-08-24 15:52:35.732251892 +0200
@@ -10,5 +10,6 @@
SOURCES += main.cpp qtdiag.cpp
HEADERS += qtdiag.h
+LIBS += -lpng
load(qt_app)
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