diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-07-09 00:23:14 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-08-05 13:12:53 +0200 |
| commit | 51baa023b310cdf2466c7499a34c0e4643c5d513 (patch) | |
| tree | c49ec1f5988949847ea1345d8bd359a9652e3eef /configure.ac | |
| parent | 6a1510789386645a86ab4c628ca11435ff903657 (diff) | |
Qt5 / KDE5 don't require qt_version_tag symbol
Thanks to the extensive debugging information by the reporter of
tdf#126272, I found the embedded Qt5 version tag:
$ objdump -T libvclplug_qt5lo.so | grep qt_version_tag
000000.. DO *UND* 000000.. Qt_5.9 qt_version_tag
So even if we try to stay Qt 5.6 compatible, this adds a dependeny
to the build Qt version. But fortunatly this symbol dependency can
be prevented by using -DQT_NO_VERSION_TAGGING, which this patch
does. We still can't be sure we don't use newer symbols, but this
way we won't prevent running with older Qt versions at all.
Change-Id: Ia85c14f888d9743645909f59867b7ad568dc6f42
Reviewed-on: https://gerrit.libreoffice.org/75280
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit 98df07a89dbdef020c7cd849861c5aa426021153)
Reviewed-on: https://gerrit.libreoffice.org/75296
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
(cherry picked from commit 04c8d3335b434c7d54b2001a8b3ac194040f13d1)
Reviewed-on: https://gerrit.libreoffice.org/75316
(cherry picked from commit 895bfb1efde4dc4e149f42b2aed6fa71696642e6)
Reviewed-on: https://gerrit.libreoffice.org/76917
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 5dddd37d5d00..9e86121fdfd5 100644 --- a/configure.ac +++ b/configure.ac @@ -11346,7 +11346,7 @@ then AC_MSG_ERROR([Qt5 libraries not found. Please specify the root of your Qt5 installation by exporting QT5DIR before running "configure".]) fi - QT5_CFLAGS="-I$qt5_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" + QT5_CFLAGS="-I$qt5_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING" QT5_CFLAGS=$(printf '%s' "$QT5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") QT5_LIBS="-L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network" @@ -11446,7 +11446,7 @@ then AC_MSG_ERROR([KF5 libraries not found. Please specify the root of your KF5 installation by exporting KF5DIR before running "configure".]) fi - KF5_CFLAGS="-I$kf5_incdir -I$kf5_incdir/KCoreAddons -I$kf5_incdir/KI18n -I$kf5_incdir/KConfigCore -I$kf5_incdir/KWindowSystem -I$kf5_incdir/KIOCore -I$kf5_incdir/KIOWidgets -I$kf5_incdir/KIOFileWidgets -I$qt5_incdir -I$qt5_incdir/QtCore -I$qt5_incdir/QtGui -I$qt5_incdir/QtWidgets -I$qt5_incdir/QtNetwork -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" + KF5_CFLAGS="-I$kf5_incdir -I$kf5_incdir/KCoreAddons -I$kf5_incdir/KI18n -I$kf5_incdir/KConfigCore -I$kf5_incdir/KWindowSystem -I$kf5_incdir/KIOCore -I$kf5_incdir/KIOWidgets -I$kf5_incdir/KIOFileWidgets -I$qt5_incdir -I$qt5_incdir/QtCore -I$qt5_incdir/QtGui -I$qt5_incdir/QtWidgets -I$qt5_incdir/QtNetwork -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING" KF5_LIBS="-L$kf5_libdir -lKF5CoreAddons -lKF5I18n -lKF5ConfigCore -lKF5WindowSystem -lKF5KIOCore -lKF5KIOWidgets -lKF5KIOFileWidgets -L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network" KF5_CFLAGS=$(printf '%s' "$KF5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") |