d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update qt5 packages

This commit is contained in:
Mark Brand 2013-01-31 14:55:46 +01:00
parent f325d48052
commit 0094ce0f93
17 changed files with 58 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
index.html
View File

@ -1898,67 +1898,67 @@ USE_OSGPLUGIN(<plugin2>)
</tr>
<tr>
<td id="qtactiveqt-package">qtactiveqt</td>
<td id="qtactiveqt-version">5.0.0</td>
<td id="qtactiveqt-version">5.0.1</td>
<td id="qtactiveqt-website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
<td id="qtbase-package">qtbase</td>
<td id="qtbase-version">5.0.0</td>
<td id="qtbase-version">5.0.1</td>
<td id="qtbase-website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
<td id="qtdeclarative-package">qtdeclarative</td>
<td id="qtdeclarative-version">5.0.0</td>
<td id="qtdeclarative-version">5.0.1</td>
<td id="qtdeclarative-website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
<td id="qtgraphicaleffects-package">qtgraphicaleffects</td>
<td id="qtgraphicaleffects-version">5.0.0</td>
<td id="qtgraphicaleffects-version">5.0.1</td>
<td id="qtgraphicaleffects-website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
<td id="qtimageformats-package">qtimageformats</td>
<td id="qtimageformats-version">5.0.0</td>
<td id="qtimageformats-version">5.0.1</td>
<td id="qtimageformats-website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
<td id="qtjsbackend-package">qtjsbackend</td>
<td id="qtjsbackend-version">5.0.0</td>
<td id="qtjsbackend-version">5.0.1</td>
<td id="qtjsbackend-website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
<td id="qtmultimedia-package">qtmultimedia</td>
<td id="qtmultimedia-version">5.0.0</td>
<td id="qtmultimedia-version">5.0.1</td>
<td id="qtmultimedia-website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
<td id="qtquick1-package">qtquick1</td>
<td id="qtquick1-version">5.0.0</td>
<td id="qtquick1-version">5.0.1</td>
<td id="qtquick1-website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
<td id="qtscript-package">qtscript</td>
<td id="qtscript-version">5.0.0</td>
<td id="qtscript-version">5.0.1</td>
<td id="qtscript-website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
<td id="qtsvg-package">qtsvg</td>
<td id="qtsvg-version">5.0.0</td>
<td id="qtsvg-version">5.0.1</td>
<td id="qtsvg-website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
<td id="qttools-package">qttools</td>
<td id="qttools-version">5.0.0</td>
<td id="qttools-version">5.0.1</td>
<td id="qttools-website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
<td id="qttranslations-package">qttranslations</td>
<td id="qttranslations-version">5.0.0</td>
<td id="qttranslations-version">5.0.1</td>
<td id="qttranslations-website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
<td id="qtxmlpatterns-package">qtxmlpatterns</td>
<td id="qtxmlpatterns-version">5.0.0</td>
<td id="qtxmlpatterns-version">5.0.1</td>
<td id="qtxmlpatterns-website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>

2
src/qtactiveqt.mk
View File

@ -3,7 +3,7 @@
PKG := qtactiveqt
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := 5f06d2267da6871bdf458d16fd99fcdc2680f1a2
$(PKG)_CHECKSUM := 9f0df31851ba1b246633b4366b3dc2836739dada
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE)

155
src/qtbase-1.cherrypicks.patch
View File

@ -1,109 +1,10 @@
This file is part of MXE.
See index.html for further information.
From 0ce550fe4687de132788957afb9c0786e1c064e0 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Fri, 14 Dec 2012 11:51:28 +0200
Subject: [PATCH 1/9] Fix installation of plugin module .pris in static Qt
builds
When building Qt static, plugins get module .pri file, but those files
do not get installed in Windows. This is because both .pri generation
and install target statements are scoped with !build_pass, which means
Makefile.Debug and Makefile.Release do not get install_pritarget
target.
Fixed by doing only the .pri generation in !build_pass scope.
Task-number: QTBUG-28606
Change-Id: If3f49b578af1d9171a8bce67793ecb3f902a6da8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
(cherry picked from commit 4c5584f0a3c003106d07d0cf8b512108b9ff541a)
diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf
index f547e2d..6e5f27b 100644
--- a/mkspecs/features/qt_plugin.prf
+++ b/mkspecs/features/qt_plugin.prf
@@ -20,16 +20,18 @@ contains(QT_CONFIG, c++11):CONFIG += c++11
contains(QT_CONFIG, static):CONFIG += static
else:CONFIG += shared
-!build_pass:static {
+static {
isEmpty(MODULE): MODULE = $$basename(TARGET)
MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_plugin_$${MODULE}.pri
- MODULE_PRI_CONT = \
- "QT_PLUGIN.$${MODULE}.TYPE = $$PLUGIN_TYPE" \
- "QT_PLUGIN.$${MODULE}.CLASS_NAME = $$PLUGIN_CLASS_NAME"
+ !build_pass {
+ MODULE_PRI_CONT = \
+ "QT_PLUGIN.$${MODULE}.TYPE = $$PLUGIN_TYPE" \
+ "QT_PLUGIN.$${MODULE}.CLASS_NAME = $$PLUGIN_CLASS_NAME"
- write_file($$MODULE_PRI, MODULE_PRI_CONT)|error("Aborting.")
+ write_file($$MODULE_PRI, MODULE_PRI_CONT)|error("Aborting.")
+ }
pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules
pritarget.files = $$MODULE_PRI
--
1.7.10.4
From 000b4bf09c9127d882455ddf7a3b2eac329dfd3d Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Wed, 19 Dec 2012 23:44:05 +0100
Subject: [PATCH 2/9] fix QMAKE_MAKE for qtCompileTest for cross building
modules
Cross bulding on unix for mingw exploits the fact that makefiles
generated for mingw work with plain make. There is no mingw32-make, so
this is the only option.
Arguably, plain make could also be used in an MSYS environment,
perhaps detected by MINGW_IN_SHELL, but there might be good reasons I
don't know about not to do this.
Change-Id: I694c74046a307c2887af1c30cca36f95e242adc1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from commit 99e5496ff7abc6bf1436783e951231ffd9a83ca0)
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
index ff52c6b..39144e7 100644
--- a/mkspecs/features/configure.prf
+++ b/mkspecs/features/configure.prf
@@ -1,11 +1,15 @@
-equals(MAKEFILE_GENERATOR, UNIX): \
+equals(MAKEFILE_GENERATOR, UNIX) {
QMAKE_MAKE = make
-else:equals(MAKEFILE_GENERATOR, MINGW): \
- QMAKE_MAKE = mingw32-make
-else:if(equals(MAKEFILE_GENERATOR, MSVC.NET)|equals(MAKEFILE_GENERATOR, MSBUILD)): \
+} else:equals(MAKEFILE_GENERATOR, MINGW) {
+ !equals(QMAKE_HOST.os, Windows): \
+ QMAKE_MAKE = make
+ else: \
+ QMAKE_MAKE = mingw32-make
+} else:if(equals(MAKEFILE_GENERATOR, MSVC.NET)|equals(MAKEFILE_GENERATOR, MSBUILD)) {
QMAKE_MAKE = nmake
-else: \
+} else {
error("Configure tests are not supported with the $$MAKEFILE_GENERATOR Makefile generator.")
+}
# Ensure that a cache is present. If none was found on startup, this will create
# one in the build directory of the project which loads this feature.
--
1.7.10.4
From ac199082b2e3d4fe3cdf73e4bc46c9892fe2fbed Mon Sep 17 00:00:00 2001
From 990c4a3ec111502fcb4738a6772e90d294cce2cd Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Fri, 11 Jan 2013 00:30:41 +0100
Subject: [PATCH 3/9] consolidate generation of metafile install targets
Subject: [PATCH 1/7] consolidate generation of metafile install targets
Metafiles such as .prl and .pc files contain paths that have to be
adjusted during installation. The same code is used for unix and
@ -114,7 +15,7 @@ Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from commit d089ecb711afcd13a32e24103e270ba000cdc68c)
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 0456d6b..d7202d0 100644
index 9d85205..b687f04 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -3285,4 +3285,25 @@ MakefileGenerator::writePkgConfigFile()
@ -197,10 +98,10 @@ index 8a1a29c..28c4fba 100644
}
}
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index fc98c3d..145dddc 100644
index bda035e..3b2c620 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -846,22 +846,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
@@ -842,22 +842,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
}
if(!ret.isEmpty())
ret += "\n\t";
@ -228,10 +129,10 @@ index fc98c3d..145dddc 100644
1.7.10.4
From be189203bf0c06f51750a5150ebd97ac7372f13f Mon Sep 17 00:00:00 2001
From 569deb7d1a39e17fb5635411a68d374233f74818 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 27 Jan 2013 14:03:16 +0100
Subject: [PATCH 4/9] don't prematurely reduce LIBS when adding sql link lists
Subject: [PATCH 2/7] don't prematurely reduce LIBS when adding sql link lists
It's possible that different database libraries share dependencies.
We need to keep their link lists intact here so that QtSql's .prl and
@ -297,10 +198,10 @@ index 3b5a689..38aab2f 100644
1.7.10.4
From aa2e332cbe96a0eeab521826e1a543dfa0457cff Mon Sep 17 00:00:00 2001
From a541a0a510b148b684cdb15da4e6a276e3c6ef83 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Tue, 29 Jan 2013 21:56:24 +0100
Subject: [PATCH 5/9] adjust paths in installed module metafiles from modular
Subject: [PATCH 3/7] adjust paths in installed module metafiles from modular
build
Fully modular prefix build now puts the includes and libs into each
@ -313,10 +214,10 @@ Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from commit 0e1427b0a6c3d304aabecd3d33708ecb0544fdba)
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index 22cec4d..ec02bd2 100644
index 50e9469..3ade5a9 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -180,7 +180,7 @@ unix|win32-g++* {
@@ -190,7 +190,7 @@ unix|win32-g++* {
!isEmpty(_QMAKE_SUPER_CACHE_): \
rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
else: \
@ -329,10 +230,10 @@ index 22cec4d..ec02bd2 100644
1.7.10.4
From e6bffe37b3da3a59241dfc514411ee71ca60076a Mon Sep 17 00:00:00 2001
From facc35e0c2f6b51ad4cbcdfe79475db155ba52e5 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Fri, 11 Jan 2013 00:30:25 +0100
Subject: [PATCH 6/9] adjust paths in installed prl files for mingw
Subject: [PATCH 4/7] adjust paths in installed prl files for mingw
Curiously, qmake could fix .prl and .pc files for unix, but only .pc
files for MinGW. qt_module.prf seems to have known this.
@ -343,10 +244,10 @@ Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from commit 6d90c2e9cbfeeb560ffaeed94d908997f90d0877)
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index ec02bd2..d3d886f 100644
index 3ade5a9..98e4b1a 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -186,11 +186,11 @@ unix|win32-g++* {
@@ -196,11 +196,11 @@ unix|win32-g++* {
lib_replace.match = $$rplbase/lib
lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace
@ -360,10 +261,10 @@ index ec02bd2..d3d886f 100644
QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace
}
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index 145dddc..f8633f3 100644
index 3b2c620..2270a00 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -829,7 +829,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
@@ -825,7 +825,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
if(slsh != -1)
dst_prl = dst_prl.right(dst_prl.length() - slsh - 1);
dst_prl = filePrefixRoot(root, targetdir + dst_prl);
@ -376,10 +277,10 @@ index 145dddc..f8633f3 100644
1.7.10.4
From d8916f439332aa060bba645debb785bc9a22179a Mon Sep 17 00:00:00 2001
From d6a4dcb0dd88fa6fb4c352d48bf0445341e7de35 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Tue, 29 Jan 2013 21:51:31 +0100
Subject: [PATCH 7/9] fix path adjustments in installed metafiles
Subject: [PATCH 5/7] fix path adjustments in installed metafiles
Task-number: QTBUG-28902
Change-Id: Ia70da8f0f0b7abb4ea2a46cb4068c0827888b322
@ -387,10 +288,10 @@ Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from commit 2be4d6ba022e1349b1b231ae852235f557c6fc20)
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf
index c700dda..c90e09d 100644
index 7abd372..f9beabd 100644
--- a/mkspecs/features/qml_plugin.prf
+++ b/mkspecs/features/qml_plugin.prf
@@ -78,3 +78,12 @@ load(qt_targets)
@@ -89,3 +89,12 @@ load(qt_targets)
}
load(qml_module)
@ -404,10 +305,10 @@ index c700dda..c90e09d 100644
+ QMAKE_PRL_INSTALL_REPLACE += lib_replace
+}
diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf
index 6e5f27b..fd53c73 100644
index 4861576..2ec523d 100644
--- a/mkspecs/features/qt_plugin.prf
+++ b/mkspecs/features/qt_plugin.prf
@@ -47,3 +47,13 @@ load(qt_targets)
@@ -58,3 +58,13 @@ load(qt_targets)
wince*:LIBS += $$QMAKE_LIBS_GUI
QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
@ -422,7 +323,7 @@ index 6e5f27b..fd53c73 100644
+ QMAKE_PRL_INSTALL_REPLACE += lib_replace
+}
diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro
index e5da5bd..6c64a8c 100644
index 32eae0b..b8c920b 100644
--- a/src/winmain/winmain.pro
+++ b/src/winmain/winmain.pro
@@ -25,3 +25,9 @@ TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
@ -439,10 +340,10 @@ index e5da5bd..6c64a8c 100644
1.7.10.4
From 811f937a3e1e6a82c46c84aa54bec99ecd897a9e Mon Sep 17 00:00:00 2001
From fca2cfc4dd5495246a29b229d98ee0b545ed6242 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 24 Sep 2012 19:53:55 +0200
Subject: [PATCH 8/9] use pkg-config for freetype
Subject: [PATCH 6/7] use pkg-config for freetype
Change-Id: Id0b048b44bcebf066c21efeb89f9c1781023a593
@ -465,10 +366,10 @@ index 7f73465..1de1d74 100644
1.7.10.4
From 1f91a58111f6d5645f8c4ef332ec7c9f4fa49e43 Mon Sep 17 00:00:00 2001
From 09426fcce6676ae7952106e3ade04cea38d9a684 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sat, 22 Dec 2012 17:45:34 +0100
Subject: [PATCH 9/9] WIP: qmake writeFile(): work around concurrent
Subject: [PATCH 7/7] WIP: qmake writeFile(): work around concurrent
QDir::mkpath() failure
This actually happened when building qtimageformats with make -j4.

2
src/qtbase.mk
View File

@ -3,7 +3,7 @@
PKG := qtbase
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := 3d553ed3fe4065b8453939831c007ec896ceb9ab
$(PKG)_CHECKSUM := 0bf71dc3a7ac13b7795801aa66673077749082c9
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE)

2
src/qtdeclarative.mk
View File

@ -3,7 +3,7 @@
PKG := qtdeclarative
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := 44bd2d8005939e790df2a73c81763220feebfee7
$(PKG)_CHECKSUM := c657d6581639ca02a456e128daa31d672a091d56
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE)

2
src/qtgraphicaleffects.mk
View File

@ -3,7 +3,7 @@
PKG := qtgraphicaleffects
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := fb071d130ae48839014c81ff9104bf8d72ab329b
$(PKG)_CHECKSUM := 837bbe710c3d3091b65e513c89d9b2dc19798188
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE)

4
src/qtimageformats-1-cherrypicks.patch
View File

@ -1,7 +1,7 @@
This file is part of MXE.
See index.html for further information.
From c75cecf3ceb1d174887ae0029b2c57bfe71f9463 Mon Sep 17 00:00:00 2001
From 7454a10238d663e048aec1e1a1871a76da646345 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 3 Nov 2011 14:11:02 +0100
Subject: [PATCH 1/2] add pkg-config support for libtiff-4
@ -40,7 +40,7 @@ index 66eea8c..8582740 100644
1.7.10.4
From b169f5342cb224b1afa16062f02f4303bab91122 Mon Sep 17 00:00:00 2001
From 4356a1b1d7dfd3391688ab08ba667465121e34b3 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Wed, 19 Dec 2012 23:29:52 +0100
Subject: [PATCH 2/2] add pkg-config support for libmng (mxe-specific)

2
src/qtimageformats.mk
View File

@ -3,7 +3,7 @@
PKG := qtimageformats
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := 982ff8bd139db4d72ee42d5372d6e8520c693368
$(PKG)_CHECKSUM := 20e4f307029a463ec59cc1d97522bab54287d4be
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE)

2
src/qtjsbackend.mk
View File

@ -3,7 +3,7 @@
PKG := qtjsbackend
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := 9f499e144080318fb6c40501b854db909f8ba3d2
$(PKG)_CHECKSUM := 14ca98f71f5f209f09c321204f31e810b4ae1cec
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE)

66
src/qtmultimedia-1-cherrypicks.patch
View File

@ -1,72 +1,10 @@
This file is part of MXE.
See index.html for further information.
From 1c8e01e0938fffc78fe074a4bfff6f287f521eb0 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 20 Dec 2012 01:20:49 +0100
Subject: [PATCH 1/2] fix include statements
diff --git a/src/plugins/directshow/camera/dscameraservice.cpp b/src/plugins/directshow/camera/dscameraservice.cpp
index 6d29741..fcbd1ef 100644
--- a/src/plugins/directshow/camera/dscameraservice.cpp
+++ b/src/plugins/directshow/camera/dscameraservice.cpp
@@ -44,7 +44,7 @@
#if defined(HAVE_WIDGETS)
#include <QtWidgets/qwidget.h>
-#include <QVideoWidgetControl.h>
+#include <QVideoWidgetControl>
#endif
#include "dscameraservice.h"
diff --git a/src/plugins/directshow/camera/dsvideodevicecontrol.cpp b/src/plugins/directshow/camera/dsvideodevicecontrol.cpp
index 4686569..7c33d13 100644
--- a/src/plugins/directshow/camera/dsvideodevicecontrol.cpp
+++ b/src/plugins/directshow/camera/dsvideodevicecontrol.cpp
@@ -49,7 +49,7 @@
#include <dshow.h>
#include <objbase.h>
#include <initguid.h>
-#include <Ocidl.h>
+#include <ocidl.h>
#include <string.h>
extern const CLSID CLSID_VideoInputDeviceCategory;
diff --git a/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp b/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp
index 843719b..d7a913d 100644
--- a/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp
+++ b/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp
@@ -42,7 +42,7 @@
#include <QtCore/qcoreevent.h>
#include <QtCore/qtimer.h>
-#include "DSVideoWidgetControl.h"
+#include "dsvideowidgetcontrol.h"
#include "dscamerasession.h"
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/directshow/camera/dsvideowidgetcontrol.h b/src/plugins/directshow/camera/dsvideowidgetcontrol.h
index ac390c8..9249c31 100644
--- a/src/plugins/directshow/camera/dsvideowidgetcontrol.h
+++ b/src/plugins/directshow/camera/dsvideowidgetcontrol.h
@@ -49,7 +49,7 @@
#include <QtMultimedia/qvideosurfaceformat.h>
#include <qvideowidgetcontrol.h>
-#include "DsCameraControl.h"
+#include "dscameracontrol.h"
QT_BEGIN_HEADER
--
1.7.10.4
From 7bf0aafc591af9c2a0f6a600cbec03e78c8ed72a Mon Sep 17 00:00:00 2001
From af295c0f78cfc8e54601048d5da66f6e81f6661e Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 13 Dec 2012 20:23:48 +0100
Subject: [PATCH 2/2] remove duplicate defs (mxe-specific)
Subject: [PATCH] remove duplicate defs (mxe-specific)
diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp

2
src/qtmultimedia.mk
View File

@ -3,7 +3,7 @@
PKG := qtmultimedia
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := 33fc39b177aeba6863a28c5d45cd2175b2faedc2
$(PKG)_CHECKSUM := a1b06efe0b3ec57cbe709b874d6408eeeeefd872
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE)

2
src/qtquick1.mk
View File

@ -3,7 +3,7 @@
PKG := qtquick1
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := 940e5a1a4921e688db003c7ebc4898d7b166577f
$(PKG)_CHECKSUM := 29e15b22ae843cb3c32b0487d3b216f4e60203b4
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE)

2
src/qtscript.mk
View File

@ -3,7 +3,7 @@
PKG := qtscript
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := 32da5598e71b81e6b83d288adc3c90d9bd5bed37
$(PKG)_CHECKSUM := 42554720714ee00029829ea2629ee516c8c32f09
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE)

2
src/qtsvg.mk
View File

@ -3,7 +3,7 @@
PKG := qtsvg
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := 7c5ae70fa90e4e527741a585e83a31fa2948a971
$(PKG)_CHECKSUM := 38871f53db4ff45717dca265b37b5cd12ffb253a
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE)

2
src/qttools.mk
View File

@ -3,7 +3,7 @@
PKG := qttools
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := 4f92847c15ba3292aef42ba395fce4e8dc78f97d
$(PKG)_CHECKSUM := 86a42c4297bde1e09052e25ead9f85b52d92c1b2
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE)

2
src/qttranslations.mk
View File

@ -3,7 +3,7 @@
PKG := qttranslations
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := 73b14d114da8a1a5eb7073eefda01d563e35bcb5
$(PKG)_CHECKSUM := c24dba6d0cb1cf8af2369863ee7e8340b7a798fd
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE)

2
src/qtxmlpatterns.mk
View File

@ -3,7 +3,7 @@
PKG := qtxmlpatterns
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := bc3af9ad83e2cd6d91b26352abb9f5c650593891
$(PKG)_CHECKSUM := da4c7def8a89fd8ca35e8ed25bb59a3034429882
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE)