[mingw-qt5-qtbase] Update to 5.4.0
Erik van Pienbroek
epienbro at fedoraproject.org
Tue Dec 30 22:28:44 UTC 2014
commit 2f59f0f7cc0e37f61db390c6978ac4790589eee4
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Tue Dec 30 23:28:24 2014 +0100
Update to 5.4.0
- Update to 5.4.0
- Thanks to Philip A Reimer (ArchLinux MinGW maintainer)
for rebasing the ANGLE patches
- Use external harfbuzz library (unfortunately this also introduces
additional runtime dependencies on mingw-freetype, mingw-bzip2,
mingw-glib2 and mingw-gettext)
.gitignore | 1 +
mingw-qt5-qtbase.spec | 29 ++++--
qt5-add-angle-support.patch | 22 ++--
qt5-qtbase-fix-linking-against-static-pcre.patch | 4 +-
qt5-use-external-angle-library.patch | 119 ++++++++++++----------
qt5-use-win32-g++-mkspecs-profile.patch | 4 +-
qt5-workaround-pkgconfig-install-issue.patch | 4 +-
sources | 2 +-
8 files changed, 102 insertions(+), 83 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 992af70..338a733 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/qtbase-opensource-src-5.3.0.tar.xz
/qtbase-opensource-src-5.3.1.tar.xz
/qtbase-opensource-src-5.3.2.tar.xz
+/qtbase-opensource-src-5.4.0.tar.xz
diff --git a/mingw-qt5-qtbase.spec b/mingw-qt5-qtbase.spec
index c01ba5b..2b9b19b 100644
--- a/mingw-qt5-qtbase.spec
+++ b/mingw-qt5-qtbase.spec
@@ -19,8 +19,8 @@
%global release_version %(echo %{version} | awk -F. '{print $1"."$2}')
Name: mingw-qt5-qtbase
-Version: 5.3.2
-Release: 2%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
+Version: 5.4.0
+Release: 1%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
Summary: Qt5 for Windows - QtBase component
License: GPLv3 with exceptions or LGPLv2 with exceptions
@@ -140,9 +140,10 @@ BuildRequires: mingw32-libpng
BuildRequires: mingw32-sqlite
BuildRequires: mingw32-dbus
BuildRequires: mingw32-pkg-config
-BuildRequires: mingw32-angleproject
+BuildRequires: mingw32-angleproject >= 0-0.11.git.30d6c2.20141113
BuildRequires: mingw32-pcre
BuildRequires: mingw32-postgresql
+BuildRequires: mingw32-harfbuzz
BuildRequires: mingw64-filesystem >= 95
BuildRequires: mingw64-gcc
@@ -156,9 +157,10 @@ BuildRequires: mingw64-libpng
BuildRequires: mingw64-sqlite
BuildRequires: mingw64-dbus
BuildRequires: mingw64-pkg-config
-BuildRequires: mingw64-angleproject
+BuildRequires: mingw64-angleproject >= 0-0.11.git.30d6c2.20141113
BuildRequires: mingw64-pcre
BuildRequires: mingw64-postgresql
+BuildRequires: mingw64-harfbuzz
BuildRequires: zip
BuildRequires: dos2unix
@@ -307,6 +309,7 @@ qt_configure_args_generic="\
-force-debug-info \
-audio-backend \
-system-zlib \
+ -system-harfbuzz \
-system-libpng \
-system-libjpeg \
-system-sqlite \
@@ -537,8 +540,6 @@ ln -s %{mingw64_target}-qmake-qt5 $RPM_BUILD_ROOT%{_bindir}/mingw64-qmake-qt5
%{mingw32_libdir}/pkgconfig/Qt5Xml.pc
%dir %{mingw32_libdir}/qt5/
%dir %{mingw32_libdir}/qt5/plugins
-%dir %{mingw32_libdir}/qt5/plugins/accessible
-%{mingw32_libdir}/qt5/plugins/accessible/qtaccessiblewidgets.dll
%dir %{mingw32_libdir}/qt5/plugins/bearer
%{mingw32_libdir}/qt5/plugins/bearer/qgenericbearer.dll
%{mingw32_libdir}/qt5/plugins/bearer/qnativewifibearer.dll
@@ -576,6 +577,7 @@ ln -s %{mingw64_target}-qmake-qt5 $RPM_BUILD_ROOT%{_bindir}/mingw64-qmake-qt5
%{mingw32_includedir}/qt5/QtNetwork/
%{mingw32_includedir}/qt5/QtOpenGL/
%{mingw32_includedir}/qt5/QtOpenGLExtensions/
+%{mingw32_includedir}/qt5/QtPlatformHeaders/
%{mingw32_includedir}/qt5/QtPlatformSupport/
%{mingw32_includedir}/qt5/QtPrintSupport/
%{mingw32_includedir}/qt5/QtSql/
@@ -585,7 +587,7 @@ ln -s %{mingw64_target}-qmake-qt5 $RPM_BUILD_ROOT%{_bindir}/mingw64-qmake-qt5
%{mingw32_docdir}/qt5/
%files -n mingw32-qt5-qmake
-%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL LICENSE.PREVIEW.COMMERCIAL
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.PREVIEW.COMMERCIAL
%{_bindir}/%{mingw32_target}-moc-qt5
%{_bindir}/%{mingw32_target}-qdbuscpp2xml-qt5
%{_bindir}/%{mingw32_target}-qdbusxml2cpp-qt5
@@ -673,8 +675,6 @@ ln -s %{mingw64_target}-qmake-qt5 $RPM_BUILD_ROOT%{_bindir}/mingw64-qmake-qt5
%{mingw64_libdir}/pkgconfig/Qt5Xml.pc
%dir %{mingw64_libdir}/qt5/
%dir %{mingw64_libdir}/qt5/plugins
-%dir %{mingw64_libdir}/qt5/plugins/accessible
-%{mingw64_libdir}/qt5/plugins/accessible/qtaccessiblewidgets.dll
%dir %{mingw64_libdir}/qt5/plugins/bearer
%{mingw64_libdir}/qt5/plugins/bearer/qgenericbearer.dll
%{mingw64_libdir}/qt5/plugins/bearer/qnativewifibearer.dll
@@ -712,6 +712,7 @@ ln -s %{mingw64_target}-qmake-qt5 $RPM_BUILD_ROOT%{_bindir}/mingw64-qmake-qt5
%{mingw64_includedir}/qt5/QtNetwork/
%{mingw64_includedir}/qt5/QtOpenGL/
%{mingw64_includedir}/qt5/QtOpenGLExtensions/
+%{mingw64_includedir}/qt5/QtPlatformHeaders/
%{mingw64_includedir}/qt5/QtPlatformSupport/
%{mingw64_includedir}/qt5/QtPrintSupport/
%{mingw64_includedir}/qt5/QtSql/
@@ -721,7 +722,7 @@ ln -s %{mingw64_target}-qmake-qt5 $RPM_BUILD_ROOT%{_bindir}/mingw64-qmake-qt5
%{mingw64_docdir}/qt5/
%files -n mingw64-qt5-qmake
-%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL LICENSE.PREVIEW.COMMERCIAL
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.PREVIEW.COMMERCIAL
%{_bindir}/%{mingw64_target}-moc-qt5
%{_bindir}/%{mingw64_target}-qdbuscpp2xml-qt5
%{_bindir}/%{mingw64_target}-qdbusxml2cpp-qt5
@@ -771,6 +772,14 @@ ln -s %{mingw64_target}-qmake-qt5 $RPM_BUILD_ROOT%{_bindir}/mingw64-qmake-qt5
%changelog
+* Mon Dec 29 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.4.0-1
+- Update to 5.4.0
+- Thanks to Philip A Reimer (ArchLinux MinGW maintainer)
+ for rebasing the ANGLE patches
+- Use external harfbuzz library (unfortunately this also introduces
+ additional runtime dependencies on mingw-freetype, mingw-bzip2,
+ mingw-glib2 and mingw-gettext)
+
* Thu Dec 4 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.3.2-2
- Rebuild against gcc 4.9.2 (to fix paths mentioned in mkspecs/qconfig.pri)
diff --git a/qt5-add-angle-support.patch b/qt5-add-angle-support.patch
index e13817c..4eb5f87 100644
--- a/qt5-add-angle-support.patch
+++ b/qt5-add-angle-support.patch
@@ -1,15 +1,15 @@
---- configure.orig 2012-11-09 23:14:38.635414585 +0100
-+++ configure 2012-11-09 23:41:48.183518371 +0100
-@@ -4606,7 +4606,7 @@
+--- configure.orig 2014-12-05 09:24:14.000000000 -0700
++++ configure 2014-12-11 09:24:32.545799224 -0700
+@@ -4765,7 +4765,7 @@
fi
if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
if compileTest x11/opengl "OpenGL"; then
- CFG_OPENGL=desktop
+ CFG_OPENGL=angle
- elif compileTest unix/opengles2 "OpenGL ES 2.x"; then
+ elif compileTest unix/opengles2 "OpenGL ES 2.0"; then
CFG_OPENGL=es2
else
-@@ -5921,6 +5921,11 @@
+@@ -5632,6 +5632,11 @@
QT_CONFIG="$QT_CONFIG opengles2"
fi
@@ -21,18 +21,18 @@
if [ "$CFG_SHARED" = "yes" ]; then
QT_CONFIG="$QT_CONFIG shared"
QTCONFIG_CONFIG="$QTCONFIG_CONFIG shared"
-@@ -6486,7 +6491,7 @@
+@@ -6588,7 +6593,7 @@
report_support " NIS ...................." "$CFG_NIS"
report_support " OpenGL / OpenVG:"
report_support " EGL .................." "$CFG_EGL"
--report_support " OpenGL ..............." "$CFG_OPENGL" yes "Desktop OpenGL" es2 "OpenGL ES 2.x"
-+report_support " OpenGL ..............." "$CFG_OPENGL" yes "Desktop OpenGL" es2 "OpenGL ES 2.x" angle "ANGLE"
+-report_support " OpenGL ..............." "$CFG_OPENGL" yes "Desktop OpenGL" es2 "OpenGL ES 2.0+"
++report_support " OpenGL ..............." "$CFG_OPENGL" yes "Desktop OpenGL" es2 "OpenGL ES 2.0+" angle "ANGLE"
report_support " OpenVG ..............." "$CFG_OPENVG-$CFG_OPENVG_SHIVA" yes-yes "ShivaVG" yes-no "native"
report_support " PCRE ..................." "$CFG_PCRE" yes "system library" qt "bundled copy"
if [ -n "$PKG_CONFIG" ]; then
---- src/plugins/platforms/windows/qwindowsglcontext.cpp.orig 2012-12-21 01:45:08.022424992 +0100
-+++ src/plugins/platforms/windows/qwindowsglcontext.cpp 2012-12-21 01:52:35.773119490 +0100
-@@ -50,7 +50,9 @@
+--- src/plugins/platforms/windows/qwindowsglcontext.cpp.orig 2014-12-05 09:24:37.000000000 -0700
++++ src/plugins/platforms/windows/qwindowsglcontext.cpp 2014-12-11 09:27:37.364281924 -0700
+@@ -45,7 +45,9 @@
#include <algorithm>
#include <wingdi.h>
diff --git a/qt5-qtbase-fix-linking-against-static-pcre.patch b/qt5-qtbase-fix-linking-against-static-pcre.patch
index f565677..3dd7746 100644
--- a/qt5-qtbase-fix-linking-against-static-pcre.patch
+++ b/qt5-qtbase-fix-linking-against-static-pcre.patch
@@ -1,8 +1,8 @@
--- qtbase-opensource-src-5.1.0/src/corelib/tools/qregularexpression.cpp.orig 2013-07-11 08:23:02.687691337 +0200
+++ qtbase-opensource-src-5.1.0/src/corelib/tools/qregularexpression.cpp 2013-07-11 08:23:27.231900674 +0200
-@@ -52,6 +52,10 @@
- #include <QtCore/qglobal.h>
+@@ -47,6 +47,10 @@
#include <QtCore/qatomic.h>
+ #include <QtCore/qdatastream.h>
+#ifdef QT_STATIC
+#define PCRE_STATIC
diff --git a/qt5-use-external-angle-library.patch b/qt5-use-external-angle-library.patch
index c2097b6..ee463e6 100644
--- a/qt5-use-external-angle-library.patch
+++ b/qt5-use-external-angle-library.patch
@@ -1,18 +1,19 @@
---- src/src.pro.orig 2014-05-24 16:09:01.748409623 +0200
-+++ src/src.pro 2014-05-24 16:09:06.382457710 +0200
-@@ -137,10 +137,6 @@
- SUBDIRS += src_3rdparty_harfbuzzng
- src_gui.depends += src_3rdparty_harfbuzzng
- }
-- win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) {
-- SUBDIRS += src_angle
-- src_gui.depends += src_angle
-- }
- SUBDIRS += src_gui src_platformsupport
- contains(QT_CONFIG, opengl(es2)?):SUBDIRS += src_openglextensions
- src_plugins.depends += src_gui src_platformsupport
---- src/gui/gui.pro.orig 2012-12-16 18:02:25.117315949 +0100
-+++ src/gui/gui.pro 2012-12-16 18:01:15.778133505 +0100
+--- src/gui/Qt5GuiConfigExtras.cmake.in 2014-12-05 09:24:36.000000000 -0700
++++ src/gui/Qt5GuiConfigExtras.cmake.in 2014-12-11 10:19:51.599972209 -0700
+@@ -2,9 +2,9 @@
+ !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
+
+ !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
+-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
++set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\")
+ !!ELSE
+-set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
++set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR\")
+ !!ENDIF
+
+ _qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS})
+--- src/gui/gui.pro 2014-12-05 09:24:35.000000000 -0700
++++ src/gui/gui.pro 2014-12-11 10:22:37.644366784 -0700
@@ -15,12 +15,6 @@
iconengines \
imageformats
@@ -37,46 +38,7 @@
CONFIG += simd optimize_full
include(accessible/accessible.pri)
---- src/plugins/platforms/windows/windows.pri.orig 2014-05-24 15:30:11.584247983 +0200
-+++ src/plugins/platforms/windows/windows.pri 2014-05-24 15:29:53.265058238 +0200
-@@ -3,6 +3,7 @@
- !wince*:LIBS *= -luser32 -lwinspool -limm32 -lwinmm -loleaut32
-
- contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2):!contains(QT_CONFIG, dynamicgl): LIBS *= -lopengl32
-+contains(QT_CONFIG, angle):LIBS += -lGLESv2 -lEGL
-
- mingw: LIBS *= -luuid
- # For the dialog helpers:
---- src/opengl/opengl.pro.orig 2012-12-21 19:30:29.916330288 +0100
-+++ src/opengl/opengl.pro 2012-12-21 19:31:01.279878067 +0100
-@@ -15,6 +15,10 @@
- contains(QT_CONFIG, opengles2):CONFIG += opengles2
- contains(QT_CONFIG, egl):CONFIG += egl
-
-+win32:contains(QT_CONFIG, angle) {
-+ LIBS_PRIVATE += -lGLESv2
-+}
-+
- HEADERS += qgl.h \
- qgl_p.h \
- qglcolormap.h \
---- src/gui/Qt5GuiConfigExtras.cmake.in.orig 2013-10-22 23:56:20.562965370 +0200
-+++ src/gui/Qt5GuiConfigExtras.cmake.in 2013-10-22 23:57:16.142476851 +0200
-@@ -2,9 +2,9 @@
- !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
-
- !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
--set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
-+set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\")
- !!ELSE
--set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
-+set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR\")
- !!ENDIF
-
- _qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS})
---- src/gui/gui.pro.orig 2013-10-23 00:12:41.084984399 +0200
-+++ src/gui/gui.pro 2013-10-23 00:14:29.872985611 +0200
-@@ -50,13 +50,21 @@
+@@ -55,13 +53,21 @@
contains(QT_CONFIG, angle) {
CMAKE_GL_INCDIRS = $$CMAKE_INCLUDE_DIR
CMAKE_ANGLE_EGL_DLL_RELEASE = libEGL.dll
@@ -102,3 +64,50 @@
CMAKE_QT_OPENGL_IMPLEMENTATION = GLESv2
} else {
+--- src/opengl/opengl.pro 2014-12-05 09:24:31.000000000 -0700
++++ src/opengl/opengl.pro 2014-12-11 10:15:45.884805707 -0700
+@@ -13,6 +13,10 @@
+ contains(QT_CONFIG, opengl):CONFIG += opengl
+ contains(QT_CONFIG, opengles2):CONFIG += opengles2
+
++win32:contains(QT_CONFIG, angle) {
++ LIBS_PRIVATE += -lGLESv2
++}
++
+ HEADERS += qgl.h \
+ qgl_p.h \
+ qglcolormap.h \
+--- src/plugins/platforms/windows/windows.pri 2014-12-05 09:24:37.000000000 -0700
++++ src/plugins/platforms/windows/windows.pri 2014-12-11 10:13:45.228261276 -0700
+@@ -3,6 +3,7 @@
+ !wince*:LIBS *= -luser32 -lwinspool -limm32 -lwinmm -loleaut32
+
+ contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2):!contains(QT_CONFIG, dynamicgl): LIBS *= -lopengl32
++contains(QT_CONFIG, angle):LIBS += -lGLESv2 -lEGL
+
+ mingw: LIBS *= -luuid
+ # For the dialog helpers:
+--- src/src.pro 2014-12-05 09:24:31.000000000 -0700
++++ src/src.pro 2014-12-11 10:06:14.882845813 -0700
+@@ -140,10 +140,6 @@
+ SUBDIRS += src_3rdparty_harfbuzzng
+ src_gui.depends += src_3rdparty_harfbuzzng
+ }
+- win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) {
+- SUBDIRS += src_angle
+- src_gui.depends += src_angle
+- }
+ SUBDIRS += src_gui src_platformsupport src_platformheaders
+ contains(QT_CONFIG, opengl(es2)?):SUBDIRS += src_openglextensions
+ src_plugins.depends += src_gui src_platformsupport src_platformheaders
+--- src/plugins/platforms/windows/qwindowseglcontext.cpp 2014-12-05 09:24:37.000000000 -0700
++++ src/plugins/platforms/windows/qwindowseglcontext.cpp 2014-12-11 20:07:27.099190408 -0700
+@@ -40,7 +40,7 @@
+
+ #if defined(QT_OPENGL_ES_2_ANGLE) || defined(QT_OPENGL_DYNAMIC)
+ # define EGL_EGLEXT_PROTOTYPES
+-# include <QtANGLE/EGL/eglext.h>
++# include <EGL/eglext.h>
+ #endif
+
+ QT_BEGIN_NAMESPACE
diff --git a/qt5-use-win32-g++-mkspecs-profile.patch b/qt5-use-win32-g++-mkspecs-profile.patch
index cef490f..bba98c3 100644
--- a/qt5-use-win32-g++-mkspecs-profile.patch
+++ b/qt5-use-win32-g++-mkspecs-profile.patch
@@ -30,12 +30,12 @@
-QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32
-QMAKE_LIBS_NETWORK = -lws2_32
+QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lpcre16
-+QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng
++QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng -lharfbuzz -lglib-2.0 -lintl -lwinmm
+QMAKE_LIBS_NETWORK = -lws2_32 -lcrypt32 -ldnsapi
QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32
-QMAKE_LIBS_OPENGL_ES2 = -llibEGL -llibGLESv2 -lgdi32 -luser32
-QMAKE_LIBS_OPENGL_ES2_DEBUG = -llibEGLd -llibGLESv2d -lgdi32 -luser32
-+QMAKE_LIBS_OPENGL_ES2 = -lEGL -lGLESv2 -lgdi32 -luser32
++QMAKE_LIBS_OPENGL_ES2 = -lEGL -lGLESv2 -ld3d9 -ldxguid -lgdi32 -luser32
+QMAKE_LIBS_OPENGL_ES2_DEBUG = $(QMAKE_LIBS_OPENGL_ES2)
QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
-QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
diff --git a/qt5-workaround-pkgconfig-install-issue.patch b/qt5-workaround-pkgconfig-install-issue.patch
index 61367a2..ef1037f 100644
--- a/qt5-workaround-pkgconfig-install-issue.patch
+++ b/qt5-workaround-pkgconfig-install-issue.patch
@@ -24,8 +24,8 @@
}
--- qmake/generators/makefile.h.orig 2013-03-26 19:17:37.624199870 +0100
+++ qmake/generators/makefile.h 2013-03-26 19:17:56.327527157 +0100
-@@ -108,7 +108,7 @@
- virtual bool writeMakefile(QTextStream &t);
+@@ -102,7 +102,7 @@
+ virtual void writeDefaultVariables(QTextStream &t);
QString pkgConfigPrefix() const;
- QString pkgConfigFileName(bool fixify=true);
diff --git a/sources b/sources
index 49ec7bc..f556783 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-563e2b10274171f1184b3fd7260b4991 qtbase-opensource-src-5.3.2.tar.xz
+eaaa72a5cb25713ca8d17f3a8d149765 qtbase-opensource-src-5.4.0.tar.xz
More information about the scm-commits
mailing list