Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
otb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
273
Issues
273
List
Boards
Labels
Service Desk
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Main Repositories
otb
Commits
58b30f13
Commit
58b30f13
authored
Sep 04, 2020
by
Cédric Traizet
Committed by
David Youssefi
Sep 09, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG: Fix Centos SuperBuild for QT 5.11
parent
8b5df962
Pipeline
#5707
failed with stages
in 123 minutes and 19 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
95 additions
and
1 deletion
+95
-1
SuperBuild/CMake/External_qt5.cmake
SuperBuild/CMake/External_qt5.cmake
+5
-1
SuperBuild/patches/QT5/qt5-3-opengl_include_dir-macx.diff
SuperBuild/patches/QT5/qt5-3-opengl_include_dir-macx.diff
+0
-0
SuperBuild/patches/QT5/qt5-4-undefined-references-linux.diff
SuperBuild/patches/QT5/qt5-4-undefined-references-linux.diff
+90
-0
No files found.
SuperBuild/CMake/External_qt5.cmake
View file @
58b30f13
...
...
@@ -98,7 +98,11 @@ if(UNIX)
set
(
QT5_SB_CONFIG
"
${
QT5_SB_CONFIG
}
-no-framework"
)
else
()
#Linux
set
(
QT5_SB_CONFIG
"
${
QT5_SB_CONFIG
}
-no-glib -no-fontconfig -qt-xcb"
)
# -no-use-gold-linker: https://bugreports.qt.io/browse/QTBUG-66571
# Without this option the gold linker is forced if it is available
# In more recent versions the default linker is used instead, and this
# option has been removed.
set
(
QT5_SB_CONFIG
"
${
QT5_SB_CONFIG
}
-no-glib -no-fontconfig -no-use-gold-linker"
)
endif
()
#common for all unix
set
(
QT5_SB_CONFIG
"
${
QT5_SB_CONFIG
}
-no-dbus -no-icu -v"
)
...
...
SuperBuild/patches/QT5/qt5-
1
-opengl_include_dir-macx.diff
→
SuperBuild/patches/QT5/qt5-
3
-opengl_include_dir-macx.diff
View file @
58b30f13
File moved
SuperBuild/patches/QT5/qt5-4-undefined-references-linux.diff
0 → 100644
View file @
58b30f13
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)
--- 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
+
+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 \
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment