diff --git a/general.ent b/general.ent index e7e2c34ba8..65d40d929c 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index b33241bfa4..3af8543cfe 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -41,6 +41,16 @@ --> + + December 17th, 2017 + + + [thomas] - Update to Qt-5.10.0 and QtWebEngine-5.10.0. Fixes + #10139. + + + + December 16th, 2017 diff --git a/packages.ent b/packages.ent index 9e588c0ea2..fb25dcd772 100644 --- a/packages.ent +++ b/packages.ent @@ -576,8 +576,8 @@ to avoid building libxml2 twice, which is slow with all deps --> - - + + diff --git a/x/lib/qt5.xml b/x/lib/qt5.xml index f139e6ba2b..8b7ccbda99 100644 --- a/x/lib/qt5.xml +++ b/x/lib/qt5.xml @@ -4,15 +4,15 @@ %general-entities; - + - + - - - - + + + + ]> @@ -82,7 +82,6 @@ Required - and @@ -103,7 +102,6 @@ , , , - , , , (Mesa @@ -240,11 +238,7 @@ ln -sfnv qt-&qt5-version; /opt/qt5 Install Qt5 by running the following commands: -echo "INCLUDEPATH += /usr/include/openssl-1.0" >> \ - qtbase/src/network/network.pro && -export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto' && - -./configure -prefix $QT5PREFIX \ +./configure -prefix $QT5PREFIX \ -sysconfdir /etc/xdg \ -confirm-license \ -opensource \ diff --git a/x/lib/qtwebengine.xml b/x/lib/qtwebengine.xml index 4989bf6236..da5f829aaf 100644 --- a/x/lib/qtwebengine.xml +++ b/x/lib/qtwebengine.xml @@ -4,13 +4,13 @@ %general-entities; - + - + - - + +