[mingw-qt] Added win64 support
epienbro
epienbro at fedoraproject.org
Sat Mar 10 22:22:20 UTC 2012
commit 7d3a2e6f7bb206cc09faecb828f90a5217110d99
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sat Mar 10 23:22:14 2012 +0100
Added win64 support
mingw-qt.spec | 452 +++++++++++++++++++++++-
qmake.conf => qmake.conf.win32 | 0
qmake.conf => qmake.conf.win64 | 32 +-
qt-merge-static-and-shared-library-trees.patch | 124 +++++++
4 files changed, 579 insertions(+), 29 deletions(-)
---
diff --git a/mingw-qt.spec b/mingw-qt.spec
index e637b09..9f9cca2 100644
--- a/mingw-qt.spec
+++ b/mingw-qt.spec
@@ -1,6 +1,4 @@
-%global __strip %{mingw32_strip}
-%global __objdump %{mingw32_objdump}
-%define __debug_install_post %{mingw32_debug_install_post}
+%?mingw_package_header
# Override the __debug_install_post argument as this package
# contains both native as well as cross compiled binaries
@@ -9,13 +7,17 @@
#%%global pre rc1
%global platform_win32 win32-g++-cross
+%global platform_win64 win32-g++-cross-x64
+
+%global mingw_build_win32 1
+%global mingw_build_win64 1
# Helper macro to retrieve the name of the openssl library
%global openssl_soname %(rpm -ql mingw32-openssl | grep -Eo 'libssl.*$' | grep -Eo '[0-9]+')
Name: mingw-qt
Version: 4.8.0
-Release: 7%{?pre}%{?dist}
+Release: 8%{?pre}%{?dist}
Summary: Qt for Windows
License: GPLv3 with exceptions or LGPLv2 with exceptions
@@ -25,8 +27,9 @@ URL: http://www.qtsoftware.com/
Source0: http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}%{?pre:-%{pre}}.tar.gz
# Special cross-compilation qmake target.
-Source1: qmake.conf
-Source2: qplatformdefs.h
+Source1: qmake.conf.win32
+Source2: qmake.conf.win64
+Source3: qplatformdefs.h
# When building Qt as static library some files have a different content
# when compared to the static library. Merge those changes manually
@@ -68,20 +71,34 @@ Patch24: 0002-Allow-replacements-when-installing-.pc-files-for-win.patch
Patch25: 0003-Activate-replacements-when-installing-.pc-files-for-.patch
Patch26: 0004-Add-TARGET_VERSION_EXT-to-pkgConfiglibName.patch
-BuildRequires: mingw32-filesystem >= 68
+BuildRequires: mingw32-filesystem >= 95
BuildRequires: mingw32-gcc
BuildRequires: mingw32-gcc-c++
BuildRequires: mingw32-binutils
BuildRequires: mingw32-openssl
BuildRequires: mingw32-zlib
-BuildRequires: mingw32-iconv
-BuildRequires: mingw32-libjpeg
+BuildRequires: mingw32-win-iconv
+BuildRequires: mingw32-libjpeg-turbo
BuildRequires: mingw32-libpng
BuildRequires: mingw32-libtiff
BuildRequires: mingw32-sqlite
BuildRequires: mingw32-dbus
BuildRequires: mingw32-pkg-config
+BuildRequires: mingw64-filesystem >= 95
+BuildRequires: mingw64-gcc
+BuildRequires: mingw64-gcc-c++
+BuildRequires: mingw64-binutils
+BuildRequires: mingw64-openssl
+BuildRequires: mingw64-zlib
+BuildRequires: mingw64-win-iconv
+BuildRequires: mingw64-libjpeg-turbo
+BuildRequires: mingw64-libpng
+BuildRequires: mingw64-libtiff
+BuildRequires: mingw64-sqlite
+BuildRequires: mingw64-dbus
+BuildRequires: mingw64-pkg-config
+
BuildRequires: zip
BuildRequires: dos2unix
@@ -94,6 +111,7 @@ This is the Windows version of Qt, for use in conjunction with the
Fedora Windows cross-compiler.
+# Win32
%package -n mingw32-qt
Summary: Qt for Windows
# This package contains the cross-compiler setup for qmake
@@ -130,8 +148,45 @@ BuildArch: noarch
%description -n mingw32-qt-static
Static version of the mingw32-qt library.
+# Win64
+%package -n mingw64-qt
+Summary: Qt for Windows
+# This package contains the cross-compiler setup for qmake
+Requires: mingw64-qt-qmake = %{version}-%{release}
+BuildArch: noarch
+
+%description -n mingw64-qt
+This package contains the Qt software toolkit for developing
+cross-platform applications.
+
+This is the Windows version of Qt, for use in conjunction with the
+Fedora Windows cross-compiler.
+
+%package -n mingw64-qt-qmake
+Summary: Qt for Windows Build Environment
+
+%description -n mingw64-qt-qmake
+This package contains the build environment for cross compiling
+applications with the Fedora Windows Qt Library and cross-compiler.
+
+%package -n mingw64-qt-tools
+Summary: Various tools belonging to the mingw64-qt library
+Requires: mingw64-qt = %{version}-%{release}
+BuildArch: noarch
+
+%description -n mingw64-qt-tools
+Various tools belonging to the mingw32-qt library.
+
+%package -n mingw64-qt-static
+Summary: Static version of the mingw64-qt library
+Requires: mingw64-qt = %{version}-%{release}
+BuildArch: noarch
+
+%description -n mingw64-qt-static
+Static version of the mingw64-qt library.
+
-%{?mingw32_debug_package}
+%?mingw_debug_package
%prep
@@ -158,7 +213,11 @@ sed -i "s/OPENSSL_SONAME/%{openssl_soname}/" src/network/ssl/qsslsocket_openssl_
# Cross-compilation qmake target.
mkdir mkspecs/%{platform_win32}
-cp %{SOURCE1} %{SOURCE2} mkspecs/%{platform_win32}
+mkdir mkspecs/%{platform_win64}
+cp %{SOURCE1} mkspecs/%{platform_win32}/qmake.conf
+cp %{SOURCE2} mkspecs/%{platform_win64}/qmake.conf
+cp %{SOURCE3} mkspecs/%{platform_win32}
+cp %{SOURCE3} mkspecs/%{platform_win64}
%build
@@ -166,6 +225,7 @@ cp %{SOURCE1} %{SOURCE2} mkspecs/%{platform_win32}
# Phonon is disabled for now because we lack the directx headers
qt_configure_args_generic="\
-qt3support \
+ -optimized-qmake \
-verbose \
-opensource \
-exceptions \
@@ -210,11 +270,28 @@ qt_configure_args_win32="\
-translationdir %{mingw32_datadir}/qt4/translations \
-xplatform %{platform_win32}"
+qt_configure_args_win64="\
+ -prefix %{mingw64_prefix} \
+ -bindir %{mingw64_bindir} \
+ -datadir %{mingw64_datadir}/qt4 \
+ -demosdir %{mingw64_datadir}/qt4/demos \
+ -docdir %{mingw64_docdir}/qt4 \
+ -examplesdir %{mingw64_datadir}/qt4/examples \
+ -headerdir %{mingw64_includedir} \
+ -libdir %{mingw64_libdir} \
+ -plugindir %{mingw64_libdir}/qt4/plugins \
+ -sysconfdir %{mingw64_sysconfdir} \
+ -translationdir %{mingw64_datadir}/qt4/translations \
+ -xplatform %{platform_win64}"
+
# RPM automatically sets the environment variable PKG_CONFIG_PATH
# to point to the native pkg-config files, but while cross compiling
# we don't want to have this environment variable set
unset PKG_CONFIG_PATH
+###############################################################################
+# Win32
+#
# We have to build Qt three times, once for the static release build, once
# for the shared release build and once for the shared debug build
#
@@ -250,16 +327,59 @@ pushd ../build_release_win32
$qt_configure_args_generic $qt_configure_args_win32
make %{?_smp_mflags}
+###############################################################################
+# Win64
+#
+# We have to build Qt three times, once for the static release build, once
+# for the shared release build and once for the shared debug build
+#
+# Unfortunately Qt only supports out-of-source builds which are in ../some_folder
+rm -rf ../build_release_static_win64
+mkdir ../build_release_static_win64
+pushd ../build_release_static_win64
+../qt-everywhere-opensource-src-%{version}/configure \
+ -release \
+ -static \
+ $qt_configure_args_generic $qt_configure_args_win64
+make %{?_smp_mflags}
+popd
+
+rm -rf ../build_debug_win64
+mkdir ../build_debug_win64
+pushd ../build_debug_win64
+../qt-everywhere-opensource-src-%{version}/configure \
+ -debug \
+ -shared \
+ -make tools \
+ $qt_configure_args_generic $qt_configure_args_win64
+make %{?_smp_mflags}
+popd
+
+rm -rf ../build_release_win64
+mkdir ../build_release_win64
+pushd ../build_release_win64
+../qt-everywhere-opensource-src-%{version}/configure \
+ -release \
+ -shared \
+ -make tools \
+ $qt_configure_args_generic $qt_configure_args_win64
+make %{?_smp_mflags}
+
+
%install
make install -C ../build_debug_win32 INSTALL_ROOT=$RPM_BUILD_ROOT
make install -C ../build_release_win32 INSTALL_ROOT=$RPM_BUILD_ROOT
+make install -C ../build_debug_win64 INSTALL_ROOT=$RPM_BUILD_ROOT
+make install -C ../build_release_win64 INSTALL_ROOT=$RPM_BUILD_ROOT
+
# Install the static libraries in a temporary prefix so we can merge everything together properly
mkdir $RPM_BUILD_ROOT/static
make install -C ../build_release_static_win32 INSTALL_ROOT=$RPM_BUILD_ROOT/static
+make install -C ../build_release_static_win64 INSTALL_ROOT=$RPM_BUILD_ROOT/static
# Rename the .a files to .dll.a as they're actually import libraries and not static libraries
-for FN in $RPM_BUILD_ROOT%{mingw32_libdir}/*.a ; do
+for FN in $RPM_BUILD_ROOT%{mingw32_libdir}/*.a $RPM_BUILD_ROOT%{mingw64_libdir}/*.a ; do
# Ignore libqtmain*.a
echo $FN | grep -q qtmain && continue
@@ -277,36 +397,45 @@ popd
# Drop the qtmain static library from the static tree as
# it's already part of the main tree
rm -f $RPM_BUILD_ROOT/static/%{mingw32_libdir}/libqtmain*
+rm -f $RPM_BUILD_ROOT/static/%{mingw64_libdir}/libqtmain*
# Give the real static libraries the correct filename to avoid future conflicts with Qt5
-for FN in $RPM_BUILD_ROOT/static%{mingw32_libdir}/*.a ; do
+for FN in $RPM_BUILD_ROOT/static%{mingw32_libdir}/*.a $RPM_BUILD_ROOT/static%{mingw64_libdir}/*.a ; do
FN_NEW=$(echo $FN | sed s/'.a$'/'4.a'/)
mv $FN $FN_NEW
done
# Move the static libraries from the static tree to the main tree
mv $RPM_BUILD_ROOT/static%{mingw32_libdir}/*.a $RPM_BUILD_ROOT%{mingw32_libdir}
+mv $RPM_BUILD_ROOT/static%{mingw64_libdir}/*.a $RPM_BUILD_ROOT%{mingw64_libdir}
# Clean up the static trees as we've now merged all interesting pieces
rm -rf $RPM_BUILD_ROOT/static
# Also install the lrelease tool
make -C ../build_release_win32/tools/linguist/lrelease install INSTALL_ROOT=$RPM_BUILD_ROOT
+make -C ../build_release_win64/tools/linguist/lrelease install INSTALL_ROOT=$RPM_BUILD_ROOT
# move QtUiTools4.dll from lib/ to bin/
mv $RPM_BUILD_ROOT%{mingw32_libdir}/QtUiTools4.dll $RPM_BUILD_ROOT%{mingw32_bindir}/
+mv $RPM_BUILD_ROOT%{mingw64_libdir}/QtUiTools4.dll $RPM_BUILD_ROOT%{mingw64_bindir}/
# Drop the debug version of the tool qmlplugindumpd.exe
rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/qmlplugindumpd.exe
+rm -f $RPM_BUILD_ROOT%{mingw64_bindir}/qmlplugindumpd.exe
# The .dll's are installed in both %%{mingw32_bindir} and %%{mingw32_libdir}
# One copy of the .dll's is sufficient
rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.dll
+rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/*.dll
# add links with version suffix for convenience
ln -s libqtmain.a $RPM_BUILD_ROOT%{mingw32_libdir}/libqtmain4.a
ln -s libqtmaind.a $RPM_BUILD_ROOT%{mingw32_libdir}/libqtmaind4.a
+ln -s libqtmain.a $RPM_BUILD_ROOT%{mingw64_libdir}/libqtmain4.a
+ln -s libqtmaind.a $RPM_BUILD_ROOT%{mingw64_libdir}/libqtmaind4.a
+
# Drop all the files which we don't need
rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.prl
rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/qt4/demos
@@ -314,9 +443,16 @@ rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/qt4/examples
rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/qt4/q3porting.xml
rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/qt4/phrasebooks/
+rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/*.prl
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/qt4/demos
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/qt4/examples
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/qt4/q3porting.xml
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/qt4/phrasebooks/
+
# The Qt build system creates a folder called 'imports' but it isn't entirely sure
# what it's purpose is. Drop it for now
rm -rf $RPM_BUILD_ROOT%{mingw32_prefix}/imports
+rm -rf $RPM_BUILD_ROOT%{mingw64_prefix}/imports
# Manually install qmake and other native tools so we don't depend anymore on
# the version of the native Fedora Qt and also fix issues as illustrated at
@@ -325,6 +461,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw32_prefix}/imports
# Also make sure the tools can be found by CMake
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{mingw32_target}/bin
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{mingw64_target}/bin
install -m0755 ../build_release_win32/bin/qmake $RPM_BUILD_ROOT%{_prefix}/%{mingw32_target}/bin/qmake-qt4
ln -s ../%{mingw32_target}/bin/qmake-qt4 $RPM_BUILD_ROOT%{_bindir}/%{mingw32_target}-qmake-qt4
@@ -335,20 +472,37 @@ for tool in lrelease moc rcc uic ; do
ln -s ../%{mingw32_target}/bin/$tool $RPM_BUILD_ROOT%{_bindir}/%{mingw32_target}-$tool
done
+install -m0755 ../build_release_win64/bin/qmake $RPM_BUILD_ROOT%{_prefix}/%{mingw64_target}/bin/qmake-qt4
+ln -s ../%{mingw64_target}/bin/qmake-qt4 $RPM_BUILD_ROOT%{_bindir}/%{mingw64_target}-qmake-qt4
+ln -s %{mingw64_target}-qmake-qt4 $RPM_BUILD_ROOT%{_bindir}/mingw64-qmake-qt4
+
+for tool in lrelease moc rcc uic ; do
+ mv $RPM_BUILD_ROOT%{mingw64_bindir}/$tool $RPM_BUILD_ROOT%{_prefix}/%{mingw64_target}/bin/$tool
+ ln -s ../%{mingw64_target}/bin/$tool $RPM_BUILD_ROOT%{_bindir}/%{mingw64_target}-$tool
+done
+
# An argument in the mkspecs profile needs to be un-commented in order to be
# useful for developers who wish to use the Qt libraries
sed -i s@'#QT_LIBINFIX'@'QT_LIBINFIX'@ $RPM_BUILD_ROOT%{mingw32_datadir}/qt4/mkspecs/%{platform_win32}/qmake.conf
+sed -i s@'#QT_LIBINFIX'@'QT_LIBINFIX'@ $RPM_BUILD_ROOT%{mingw64_datadir}/qt4/mkspecs/%{platform_win64}/qmake.conf
# Remove some duplicate mkspecs data
rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/qt4/mkspecs/%{platform_win32}/default
rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/qt4/mkspecs/%{platform_win32}/%{platform_win32}
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/qt4/mkspecs/%{platform_win64}/default
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/qt4/mkspecs/%{platform_win64}/%{platform_win64}
+
# Workaround a bug where building against the debug binaries will always fail:
# https://bugreports.qt.nokia.com/browse/QTBUG-14467
sed -i s@'$${QT_LIBINFIX}d'@'d$${QT_LIBINFIX}'@ $RPM_BUILD_ROOT%{mingw32_datadir}/qt4/mkspecs/features/win32/windows.prf
sed -i s@'$${QT_LIBINFIX}d'@'d$${QT_LIBINFIX}'@ $RPM_BUILD_ROOT%{mingw32_datadir}/qt4/mkspecs/features/qt_functions.prf
+sed -i s@'$${QT_LIBINFIX}d'@'d$${QT_LIBINFIX}'@ $RPM_BUILD_ROOT%{mingw64_datadir}/qt4/mkspecs/features/win32/windows.prf
+sed -i s@'$${QT_LIBINFIX}d'@'d$${QT_LIBINFIX}'@ $RPM_BUILD_ROOT%{mingw64_datadir}/qt4/mkspecs/features/qt_functions.prf
+
+# Win32
%files -n mingw32-qt
%{mingw32_bindir}/Qt3Support4.dll
%{mingw32_bindir}/Qt3Supportd4.dll
@@ -617,8 +771,280 @@ sed -i s@'$${QT_LIBINFIX}d'@'d$${QT_LIBINFIX}'@ $RPM_BUILD_ROOT%{mingw32_datadir
%{mingw32_libdir}/libQtXml4.a
%{mingw32_libdir}/libQtXmlPatterns4.a
+# Win64
+%files -n mingw64-qt
+%{mingw64_bindir}/Qt3Support4.dll
+%{mingw64_bindir}/Qt3Supportd4.dll
+%{mingw64_bindir}/QtCLucene4.dll
+%{mingw64_bindir}/QtCLucened4.dll
+%{mingw64_bindir}/QtCore4.dll
+%{mingw64_bindir}/QtCored4.dll
+%{mingw64_bindir}/QtDBus4.dll
+%{mingw64_bindir}/QtDBusd4.dll
+%{mingw64_bindir}/QtDeclarative4.dll
+%{mingw64_bindir}/QtDeclaratived4.dll
+%{mingw64_bindir}/QtDesigner4.dll
+%{mingw64_bindir}/QtDesignerd4.dll
+%{mingw64_bindir}/QtDesignerComponents4.dll
+%{mingw64_bindir}/QtDesignerComponentsd4.dll
+%{mingw64_bindir}/QtGui4.dll
+%{mingw64_bindir}/QtGuid4.dll
+%{mingw64_bindir}/QtHelp4.dll
+%{mingw64_bindir}/QtHelpd4.dll
+%{mingw64_bindir}/QtNetwork4.dll
+%{mingw64_bindir}/QtNetworkd4.dll
+%{mingw64_bindir}/QtOpenGL4.dll
+%{mingw64_bindir}/QtOpenGLd4.dll
+%{mingw64_bindir}/QtScript4.dll
+%{mingw64_bindir}/QtScriptd4.dll
+%{mingw64_bindir}/QtScriptTools4.dll
+%{mingw64_bindir}/QtScriptToolsd4.dll
+%{mingw64_bindir}/QtSql4.dll
+%{mingw64_bindir}/QtSqld4.dll
+%{mingw64_bindir}/QtSvg4.dll
+%{mingw64_bindir}/QtSvgd4.dll
+%{mingw64_bindir}/QtUiTools4.dll
+%{mingw64_bindir}/QtXml4.dll
+%{mingw64_bindir}/QtXmld4.dll
+%{mingw64_bindir}/QtXmlPatterns4.dll
+%{mingw64_bindir}/QtXmlPatternsd4.dll
+%{mingw64_bindir}/QtMultimedia4.dll
+%{mingw64_bindir}/QtMultimediad4.dll
+%{mingw64_bindir}/QtTest4.dll
+%{mingw64_bindir}/QtTestd4.dll
+%{mingw64_bindir}/QtWebKit4.dll
+%{mingw64_bindir}/QtWebKitd4.dll
+%{mingw64_libdir}/libQt3Support4.dll.a
+%{mingw64_libdir}/libQt3Supportd4.dll.a
+%{mingw64_libdir}/libQtCLucene4.dll.a
+%{mingw64_libdir}/libQtCLucened4.dll.a
+%{mingw64_libdir}/libQtCore4.dll.a
+%{mingw64_libdir}/libQtCored4.dll.a
+%{mingw64_libdir}/libQtDBus4.dll.a
+%{mingw64_libdir}/libQtDBusd4.dll.a
+%{mingw64_libdir}/libQtDeclarative4.dll.a
+%{mingw64_libdir}/libQtDeclaratived4.dll.a
+%{mingw64_libdir}/libQtDesigner4.dll.a
+%{mingw64_libdir}/libQtDesignerd4.dll.a
+%{mingw64_libdir}/libQtDesignerComponents4.dll.a
+%{mingw64_libdir}/libQtDesignerComponentsd4.dll.a
+%{mingw64_libdir}/libQtGui4.dll.a
+%{mingw64_libdir}/libQtGuid4.dll.a
+%{mingw64_libdir}/libQtHelp4.dll.a
+%{mingw64_libdir}/libQtHelpd4.dll.a
+%{mingw64_libdir}/libqtmain.a
+%{mingw64_libdir}/libqtmaind.a
+%{mingw64_libdir}/libqtmain4.a
+%{mingw64_libdir}/libqtmaind4.a
+%{mingw64_libdir}/libQtMultimedia4.dll.a
+%{mingw64_libdir}/libQtMultimediad4.dll.a
+%{mingw64_libdir}/libQtNetwork4.dll.a
+%{mingw64_libdir}/libQtNetworkd4.dll.a
+%{mingw64_libdir}/libQtOpenGL4.dll.a
+%{mingw64_libdir}/libQtOpenGLd4.dll.a
+%{mingw64_libdir}/libQtScript4.dll.a
+%{mingw64_libdir}/libQtScriptd4.dll.a
+%{mingw64_libdir}/libQtScriptTools4.dll.a
+%{mingw64_libdir}/libQtScriptToolsd4.dll.a
+%{mingw64_libdir}/libQtSql4.dll.a
+%{mingw64_libdir}/libQtSqld4.dll.a
+%{mingw64_libdir}/libQtSvg4.dll.a
+%{mingw64_libdir}/libQtSvgd4.dll.a
+%{mingw64_libdir}/libQtTest4.dll.a
+%{mingw64_libdir}/libQtTestd4.dll.a
+%{mingw64_libdir}/libQtUiTools4.dll.a
+%{mingw64_libdir}/libQtUiToolsd4.dll.a
+%{mingw64_libdir}/libQtWebKit4.dll.a
+%{mingw64_libdir}/libQtWebKitd4.dll.a
+%{mingw64_libdir}/libQtXml4.dll.a
+%{mingw64_libdir}/libQtXmld4.dll.a
+%{mingw64_libdir}/libQtXmlPatterns4.dll.a
+%{mingw64_libdir}/libQtXmlPatternsd4.dll.a
+%{mingw64_libdir}/pkgconfig/Qt3Support.pc
+%{mingw64_libdir}/pkgconfig/Qt3Supportd.pc
+%{mingw64_libdir}/pkgconfig/QtCLucene.pc
+%{mingw64_libdir}/pkgconfig/QtCLucened.pc
+%{mingw64_libdir}/pkgconfig/QtCore.pc
+%{mingw64_libdir}/pkgconfig/QtCored.pc
+%{mingw64_libdir}/pkgconfig/QtDBus.pc
+%{mingw64_libdir}/pkgconfig/QtDBusd.pc
+%{mingw64_libdir}/pkgconfig/QtDeclarative.pc
+%{mingw64_libdir}/pkgconfig/QtDeclaratived.pc
+%{mingw64_libdir}/pkgconfig/QtGui.pc
+%{mingw64_libdir}/pkgconfig/QtGuid.pc
+%{mingw64_libdir}/pkgconfig/QtHelp.pc
+%{mingw64_libdir}/pkgconfig/QtHelpd.pc
+%{mingw64_libdir}/pkgconfig/qtmain.pc
+%{mingw64_libdir}/pkgconfig/qtmaind.pc
+%{mingw64_libdir}/pkgconfig/QtMultimedia.pc
+%{mingw64_libdir}/pkgconfig/QtMultimediad.pc
+%{mingw64_libdir}/pkgconfig/QtNetwork.pc
+%{mingw64_libdir}/pkgconfig/QtNetworkd.pc
+%{mingw64_libdir}/pkgconfig/QtOpenGL.pc
+%{mingw64_libdir}/pkgconfig/QtOpenGLd.pc
+%{mingw64_libdir}/pkgconfig/QtScript.pc
+%{mingw64_libdir}/pkgconfig/QtScriptd.pc
+%{mingw64_libdir}/pkgconfig/QtScriptTools.pc
+%{mingw64_libdir}/pkgconfig/QtScriptToolsd.pc
+%{mingw64_libdir}/pkgconfig/QtSql.pc
+%{mingw64_libdir}/pkgconfig/QtSqld.pc
+%{mingw64_libdir}/pkgconfig/QtSvg.pc
+%{mingw64_libdir}/pkgconfig/QtSvgd.pc
+%{mingw64_libdir}/pkgconfig/QtTest.pc
+%{mingw64_libdir}/pkgconfig/QtTestd.pc
+%{mingw64_libdir}/pkgconfig/QtUiTools.pc
+%{mingw64_libdir}/pkgconfig/QtUiToolsd.pc
+%{mingw64_libdir}/pkgconfig/QtWebKit.pc
+%{mingw64_libdir}/pkgconfig/QtWebKitd.pc
+%{mingw64_libdir}/pkgconfig/QtXmlPatterns.pc
+%{mingw64_libdir}/pkgconfig/QtXmlPatternsd.pc
+%{mingw64_libdir}/pkgconfig/QtXml.pc
+%{mingw64_libdir}/pkgconfig/QtXmld.pc
+%dir %{mingw64_libdir}/qt4/
+%dir %{mingw64_libdir}/qt4/plugins
+%dir %{mingw64_libdir}/qt4/plugins/accessible
+%{mingw64_libdir}/qt4/plugins/accessible/qtaccessiblecompatwidgets4.dll
+%{mingw64_libdir}/qt4/plugins/accessible/qtaccessiblecompatwidgetsd4.dll
+%{mingw64_libdir}/qt4/plugins/accessible/qtaccessiblewidgets4.dll
+%{mingw64_libdir}/qt4/plugins/accessible/qtaccessiblewidgetsd4.dll
+%dir %{mingw64_libdir}/qt4/plugins/bearer
+%{mingw64_libdir}/qt4/plugins/bearer/qgenericbearer4.dll
+%{mingw64_libdir}/qt4/plugins/bearer/qgenericbearerd4.dll
+%{mingw64_libdir}/qt4/plugins/bearer/qnativewifibearer4.dll
+%{mingw64_libdir}/qt4/plugins/bearer/qnativewifibearerd4.dll
+%dir %{mingw64_libdir}/qt4/plugins/codecs
+%{mingw64_libdir}/qt4/plugins/codecs/qcncodecs4.dll
+%{mingw64_libdir}/qt4/plugins/codecs/qcncodecsd4.dll
+%{mingw64_libdir}/qt4/plugins/codecs/qjpcodecs4.dll
+%{mingw64_libdir}/qt4/plugins/codecs/qjpcodecsd4.dll
+%{mingw64_libdir}/qt4/plugins/codecs/qkrcodecs4.dll
+%{mingw64_libdir}/qt4/plugins/codecs/qkrcodecsd4.dll
+%{mingw64_libdir}/qt4/plugins/codecs/qtwcodecs4.dll
+%{mingw64_libdir}/qt4/plugins/codecs/qtwcodecsd4.dll
+%dir %{mingw64_libdir}/qt4/plugins/graphicssystems
+%{mingw64_libdir}/qt4/plugins/graphicssystems/qglgraphicssystem4.dll
+%{mingw64_libdir}/qt4/plugins/graphicssystems/qglgraphicssystemd4.dll
+%{mingw64_libdir}/qt4/plugins/graphicssystems/qtracegraphicssystem4.dll
+%{mingw64_libdir}/qt4/plugins/graphicssystems/qtracegraphicssystemd4.dll
+%dir %{mingw64_libdir}/qt4/plugins/iconengines
+%{mingw64_libdir}/qt4/plugins/iconengines/qsvgicon4.dll
+%{mingw64_libdir}/qt4/plugins/iconengines/qsvgicond4.dll
+%dir %{mingw64_libdir}/qt4/plugins/imageformats
+%{mingw64_libdir}/qt4/plugins/imageformats/qgif4.dll
+%{mingw64_libdir}/qt4/plugins/imageformats/qgifd4.dll
+%{mingw64_libdir}/qt4/plugins/imageformats/qico4.dll
+%{mingw64_libdir}/qt4/plugins/imageformats/qicod4.dll
+%{mingw64_libdir}/qt4/plugins/imageformats/qjpeg4.dll
+%{mingw64_libdir}/qt4/plugins/imageformats/qjpegd4.dll
+%{mingw64_libdir}/qt4/plugins/imageformats/qmng4.dll
+%{mingw64_libdir}/qt4/plugins/imageformats/qmngd4.dll
+%{mingw64_libdir}/qt4/plugins/imageformats/qsvg4.dll
+%{mingw64_libdir}/qt4/plugins/imageformats/qsvgd4.dll
+%{mingw64_libdir}/qt4/plugins/imageformats/qtiff4.dll
+%{mingw64_libdir}/qt4/plugins/imageformats/qtiffd4.dll
+%{mingw64_libdir}/qt4/plugins/imageformats/qtga4.dll
+%{mingw64_libdir}/qt4/plugins/imageformats/qtgad4.dll
+%dir %{mingw64_libdir}/qt4/plugins/qmltooling
+%{mingw64_libdir}/qt4/plugins/qmltooling/qmldbg_inspector4.dll
+%{mingw64_libdir}/qt4/plugins/qmltooling/qmldbg_inspectord4.dll
+%{mingw64_libdir}/qt4/plugins/qmltooling/qmldbg_tcp4.dll
+%{mingw64_libdir}/qt4/plugins/qmltooling/qmldbg_tcpd4.dll
+%dir %{mingw64_libdir}/qt4/plugins/script
+%{mingw64_libdir}/qt4/plugins/script/qtscriptdbus4.dll
+%{mingw64_libdir}/qt4/plugins/script/qtscriptdbusd4.dll
+%dir %{mingw64_libdir}/qt4/plugins/sqldrivers
+%{mingw64_libdir}/qt4/plugins/sqldrivers/qsqlite4.dll
+%{mingw64_libdir}/qt4/plugins/sqldrivers/qsqlited4.dll
+%{mingw64_libdir}/qt4/plugins/sqldrivers/qsqlodbc4.dll
+%{mingw64_libdir}/qt4/plugins/sqldrivers/qsqlodbcd4.dll
+%{mingw64_includedir}/Qt/
+%{mingw64_includedir}/Qt3Support/
+%{mingw64_includedir}/QtCore/
+%{mingw64_includedir}/QtDBus
+%{mingw64_includedir}/QtDeclarative/
+%{mingw64_includedir}/QtDesigner/
+%{mingw64_includedir}/QtGui/
+%{mingw64_includedir}/QtHelp/
+%{mingw64_includedir}/QtMultimedia/
+%{mingw64_includedir}/QtNetwork/
+%{mingw64_includedir}/QtOpenGL/
+%{mingw64_includedir}/QtScript/
+%{mingw64_includedir}/QtScriptTools/
+%{mingw64_includedir}/QtSql/
+%{mingw64_includedir}/QtSvg/
+%{mingw64_includedir}/QtTest/
+%{mingw64_includedir}/QtUiTools/
+%{mingw64_includedir}/QtWebKit/
+%{mingw64_includedir}/QtXml/
+%{mingw64_includedir}/QtXmlPatterns/
+%{mingw64_datadir}/qt4/
+
+%files -n mingw64-qt-qmake
+%doc LICENSE.GPL3 LICENSE.LGPL LGPL_EXCEPTION.txt README
+%{_bindir}/%{mingw64_target}-lrelease
+%{_bindir}/%{mingw64_target}-moc
+%{_bindir}/%{mingw64_target}-qmake-qt4
+%{_bindir}/%{mingw64_target}-rcc
+%{_bindir}/%{mingw64_target}-uic
+%{_bindir}/mingw64-qmake-qt4
+%{_prefix}/%{mingw64_target}/bin/lrelease
+%{_prefix}/%{mingw64_target}/bin/moc
+%{_prefix}/%{mingw64_target}/bin/qmake-qt4
+%{_prefix}/%{mingw64_target}/bin/rcc
+%{_prefix}/%{mingw64_target}/bin/uic
+%{mingw64_datadir}/qt4/mkspecs/%{platform_win64}
+
+%files -n mingw64-qt-tools
+%{mingw64_bindir}/assistant.exe
+%{mingw64_bindir}/designer.exe
+%{mingw64_bindir}/lconvert.exe
+%{mingw64_bindir}/linguist.exe
+%{mingw64_bindir}/lupdate.exe
+%{mingw64_bindir}/pixeltool.exe
+%{mingw64_bindir}/qcollectiongenerator.exe
+%{mingw64_bindir}/qdbus.exe
+%{mingw64_bindir}/qdbuscpp2xml.exe
+%{mingw64_bindir}/qdbusviewer.exe
+%{mingw64_bindir}/qdbusxml2cpp.exe
+%{mingw64_bindir}/qhelpconverter.exe
+%{mingw64_bindir}/qhelpgenerator.exe
+%{mingw64_bindir}/qmlplugindump.exe
+%{mingw64_bindir}/qmlviewer.exe
+%{mingw64_bindir}/qt3to4.exe
+%{mingw64_bindir}/qttracereplay.exe
+%{mingw64_bindir}/xmlpatterns.exe
+%{mingw64_bindir}/xmlpatternsvalidator.exe
+%dir %{mingw64_libdir}/qt4/plugins/designer/
+%{mingw64_libdir}/qt4/plugins/designer/qdeclarativeview.dll
+%{mingw64_libdir}/qt4/plugins/designer/qdeclarativeviewd.dll
+%{mingw64_libdir}/qt4/plugins/designer/qt3supportwidgets.dll
+%{mingw64_libdir}/qt4/plugins/designer/qt3supportwidgetsd.dll
+%{mingw64_libdir}/qt4/plugins/designer/qwebview.dll
+%{mingw64_libdir}/qt4/plugins/designer/qwebviewd.dll
+
+%files -n mingw64-qt-static
+%{mingw64_libdir}/libQt3Support4.a
+%{mingw64_libdir}/libQtCore4.a
+%{mingw64_libdir}/libQtDBus4.a
+%{mingw64_libdir}/libQtDeclarative4.a
+%{mingw64_libdir}/libQtGui4.a
+%{mingw64_libdir}/libQtMultimedia4.a
+%{mingw64_libdir}/libQtNetwork4.a
+%{mingw64_libdir}/libQtOpenGL4.a
+%{mingw64_libdir}/libQtScript4.a
+%{mingw64_libdir}/libQtScriptTools4.a
+%{mingw64_libdir}/libQtSql4.a
+%{mingw64_libdir}/libQtSvg4.a
+%{mingw64_libdir}/libQtTest4.a
+#%{mingw64_libdir}/libQtWebKit4.a
+%{mingw64_libdir}/libQtXml4.a
+%{mingw64_libdir}/libQtXmlPatterns4.a
+
%changelog
+* Sat Mar 10 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.8.0-8
+- Added win64 support
+
* Fri Mar 09 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.8.0-7
- Provide an arch-specific mingw32-qt-qmake package which contains
tools like qmake and moc which are required for compiling binaries
diff --git a/qmake.conf b/qmake.conf.win32
similarity index 100%
copy from qmake.conf
copy to qmake.conf.win32
diff --git a/qmake.conf b/qmake.conf.win64
similarity index 80%
rename from qmake.conf
rename to qmake.conf.win64
index 22a1d07..7cc77eb 100644
--- a/qmake.conf
+++ b/qmake.conf.win64
@@ -1,7 +1,7 @@
#
-# qmake configuration for fedora-win32-cross
+# qmake configuration for fedora-win32-cross-x64
# (Fedora Windows cross-compiler)
-# by Richard W.M. Jones (rjones at redhat.com)
+# by Richard W.M. Jones (rjones at redhat.com) and Erik van Pienbroek <epienbro at fedoraproject.org>
#
# Written for MinGW
#
@@ -16,12 +16,12 @@ QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
QMAKE_EXT_OBJ = .o
QMAKE_EXT_RES = _res.o
-QMAKE_CC = i686-w64-mingw32-gcc
+QMAKE_CC = x86_64-w64-mingw32-gcc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =
QMAKE_YACC = byacc
QMAKE_YACCFLAGS = -d
-QMAKE_CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 --param=ssp-buffer-size=4 -fno-keep-inline-dllexport
+QMAKE_CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 --param=ssp-buffer-size=4 -mms-bitfields -fno-keep-inline-dllexport
QMAKE_CFLAGS_DEPS = -M
QMAKE_CFLAGS_WARN_ON = -Wall
QMAKE_CFLAGS_WARN_OFF = -w
@@ -29,7 +29,7 @@ QMAKE_CFLAGS_RELEASE = -O2
QMAKE_CFLAGS_DEBUG = -g
QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
-QMAKE_CXX = i686-w64-mingw32-g++
+QMAKE_CXX = x86_64-w64-mingw32-g++
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
@@ -45,16 +45,16 @@ QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
QMAKE_INCDIR =
#QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
-QMAKE_INCDIR_QT = /usr/i686-w64-mingw32/sys-root/mingw/include
+QMAKE_INCDIR_QT = /usr/x86_64-w64-mingw32/sys-root/mingw/include
#QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
-QMAKE_LIBDIR_QT = /usr/i686-w64-mingw32/sys-root/mingw/lib
+QMAKE_LIBDIR_QT = /usr/x86_64-w64-mingw32/sys-root/mingw/lib
QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-QMAKE_LINK = i686-w64-mingw32-g++
+QMAKE_LINK = x86_64-w64-mingw32-g++
QMAKE_LFLAGS =
QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
QMAKE_LFLAGS_EXCEPTIONS_OFF =
@@ -94,18 +94,18 @@ QMAKE_INSTALL_PROGRAM = install -m 755 -p
QMAKE_CHK_DIR_EXISTS = mkdir -p
QMAKE_MKDIR =
-PKG_CONFIG = i686-w64-mingw32-pkg-config
-QMAKE_LRELEASE = i686-w64-mingw32-lrelease
-QMAKE_MOC = i686-w64-mingw32-moc
-QMAKE_UIC = i686-w64-mingw32-uic
-QMAKE_RCC = i686-w64-mingw32-rcc
+PKG_CONFIG = x86_64-w64-mingw32-pkg-config
+QMAKE_LRELEASE = x86_64-w64-mingw32-lrelease
+QMAKE_MOC = x86_64-w64-mingw32-moc
+QMAKE_UIC = x86_64-w64-mingw32-uic
+QMAKE_RCC = x86_64-w64-mingw32-rcc
QMAKE_IDL = midl
-QMAKE_LIB = i686-w64-mingw32-ar -ru
-QMAKE_RC = i686-w64-mingw32-windres
+QMAKE_LIB = x86_64-w64-mingw32-ar -ru
+QMAKE_RC = x86_64-w64-mingw32-windres
QMAKE_ZIP = zip -r -9
-QMAKE_STRIP = i686-w64-mingw32-strip
+QMAKE_STRIP = x86_64-w64-mingw32-strip
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
load(qt_config)
diff --git a/qt-merge-static-and-shared-library-trees.patch b/qt-merge-static-and-shared-library-trees.patch
index 53f5e6c..c757293 100644
--- a/qt-merge-static-and-shared-library-trees.patch
+++ b/qt-merge-static-and-shared-library-trees.patch
@@ -122,3 +122,127 @@
# Now load the global default_post
load(default_post)
+--- usr/x86_64-w64-mingw32/sys-root/mingw/include/QtCore/qconfig.h.orig 2011-12-25 21:03:37.022018831 +0100
++++ usr/x86_64-w64-mingw32/sys-root/mingw/include/QtCore/qconfig.h 2011-12-25 21:13:50.704976445 +0100
+@@ -26,6 +26,14 @@
+
+ #ifndef QT_BOOTSTRAPPED
+
++#if defined(QT_NODLL)
++#if defined(QT_BUILTIN_GIF_READER) && defined(QT_NO_BUILTIN_GIF_READER)
++# undef QT_BUILTIN_GIF_READER
++#elif !defined(QT_BUILTIN_GIF_READER) && !defined(QT_NO_BUILTIN_GIF_READER)
++# define QT_BUILTIN_GIF_READER 1
++#endif
++#endif
++
+ #if defined(QT_NO_ALSA) && defined(QT_ALSA)
+ # undef QT_NO_ALSA
+ #elif !defined(QT_NO_ALSA) && !defined(QT_ALSA)
+@@ -80,6 +88,7 @@
+ # define QT_NO_ICD
+ #endif
+
++#if !defined(QT_NODLL)
+ #if defined(QT_NO_IMAGEFORMAT_JPEG) && defined(QT_IMAGEFORMAT_JPEG)
+ # undef QT_NO_IMAGEFORMAT_JPEG
+ #elif !defined(QT_NO_IMAGEFORMAT_JPEG) && !defined(QT_IMAGEFORMAT_JPEG)
+@@ -97,6 +106,7 @@
+ #elif !defined(QT_NO_IMAGEFORMAT_TIFF) && !defined(QT_IMAGEFORMAT_TIFF)
+ # define QT_NO_IMAGEFORMAT_TIFF
+ #endif
++#endif
+
+ #if defined(QT_NO_INOTIFY) && defined(QT_INOTIFY)
+ # undef QT_NO_INOTIFY
+@@ -176,6 +186,14 @@
+ # define QT_NO_SYSTEMSEMAPHORE
+ #endif
+
++#if defined(QT_NODLL)
++#if defined(QT_NO_WEBKIT) && defined(QT_WEBKIT)
++# undef QT_NO_WEBKIT
++#elif !defined(QT_NO_WEBKIT) && !defined(QT_WEBKIT)
++# define QT_NO_WEBKIT
++#endif
++#endif
++
+ #if defined(QT_NO_ZLIB) && defined(QT_ZLIB)
+ # undef QT_NO_ZLIB
+ #elif !defined(QT_NO_ZLIB) && !defined(QT_ZLIB)
+--- usr/x86_64-w64-mingw32/sys-root/mingw/include/Qt/qconfig.h.orig 2011-12-25 21:03:13.349289762 +0100
++++ usr/x86_64-w64-mingw32/sys-root/mingw/include/Qt/qconfig.h 2011-12-25 21:06:37.386579371 +0100
+@@ -26,6 +26,14 @@
+
+ #ifndef QT_BOOTSTRAPPED
+
++#if defined(QT_NODLL)
++#if defined(QT_BUILTIN_GIF_READER) && defined(QT_NO_BUILTIN_GIF_READER)
++# undef QT_BUILTIN_GIF_READER
++#elif !defined(QT_BUILTIN_GIF_READER) && !defined(QT_NO_BUILTIN_GIF_READER)
++# define QT_BUILTIN_GIF_READER 1
++#endif
++#endif
++
+ #if defined(QT_NO_ALSA) && defined(QT_ALSA)
+ # undef QT_NO_ALSA
+ #elif !defined(QT_NO_ALSA) && !defined(QT_ALSA)
+@@ -80,6 +88,7 @@
+ # define QT_NO_ICD
+ #endif
+
++#if !defined(QT_NODLL)
+ #if defined(QT_NO_IMAGEFORMAT_JPEG) && defined(QT_IMAGEFORMAT_JPEG)
+ # undef QT_NO_IMAGEFORMAT_JPEG
+ #elif !defined(QT_NO_IMAGEFORMAT_JPEG) && !defined(QT_IMAGEFORMAT_JPEG)
+@@ -97,6 +106,7 @@
+ #elif !defined(QT_NO_IMAGEFORMAT_TIFF) && !defined(QT_IMAGEFORMAT_TIFF)
+ # define QT_NO_IMAGEFORMAT_TIFF
+ #endif
++#endif
+
+ #if defined(QT_NO_INOTIFY) && defined(QT_INOTIFY)
+ # undef QT_NO_INOTIFY
+@@ -176,6 +186,14 @@
+ # define QT_NO_SYSTEMSEMAPHORE
+ #endif
+
++#if defined(QT_NODLL)
++#if defined(QT_NO_WEBKIT) && defined(QT_WEBKIT)
++# undef QT_NO_WEBKIT
++#elif !defined(QT_NO_WEBKIT) && !defined(QT_WEBKIT)
++# define QT_NO_WEBKIT
++#endif
++#endif
++
+ #if defined(QT_NO_ZLIB) && defined(QT_ZLIB)
+ # undef QT_NO_ZLIB
+ #elif !defined(QT_NO_ZLIB) && !defined(QT_ZLIB)
+--- usr/x86_64-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/qconfig.pri.orig 2011-12-25 21:09:01.616032758 +0100
++++ usr/x86_64-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/qconfig.pri 2011-12-25 21:12:14.685003350 +0100
+@@ -2,7 +2,11 @@
+ CONFIG += def_files_disabled exceptions rtti no_mocdepend release stl qt_no_framework
+ QT_ARCH = windows
+ QT_EDITION = OpenSource
+-QT_CONFIG += minimal-config small-config medium-config large-config full-config qt3support accessibility opengl reduce_exports ipv6 getaddrinfo system-jpeg system-png png system-tiff no-freetype system-zlib gnu-libiconv dbus dbus-linked openssl xmlpatterns multimedia audio-backend svg script scripttools declarative release
++contains(CONFIG, static) {
++ QT_CONFIG += minimal-config small-config medium-config large-config full-config qt3support accessibility opengl reduce_exports ipv6 getaddrinfo system-jpeg jpeg mng system-png png gif system-tiff tiff no-freetype system-zlib gnu-libiconv dbus dbus-linked openssl xmlpatterns multimedia audio-backend svg script scripttools declarative release
++} else {
++ QT_CONFIG += minimal-config small-config medium-config large-config full-config qt3support accessibility opengl reduce_exports ipv6 getaddrinfo system-jpeg system-png png system-tiff no-freetype system-zlib gnu-libiconv dbus dbus-linked openssl xmlpatterns multimedia audio-backend svg script scripttools declarative release
++}
+
+ #versioning
+ QT_VERSION = 4.8.0
+--- usr/x86_64-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/features/win32/default_post.prf.orig 2011-12-26 02:29:56.365208473 +0100
++++ usr/x86_64-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/features/win32/default_post.prf 2011-12-26 02:31:03.650208601 +0100
+@@ -6,6 +6,10 @@
+ }
+ }
+
++contains(CONFIG, static) {
++ QMAKE_LFLAGS += -static
++}
++
+ # Now load the global default_post
+ load(default_post)
+
More information about the scm-commits
mailing list