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 (5.2.0 final)

This commit is contained in:
Mark Brand 2013-12-12 12:37:52 +01:00
parent e02abb5169
commit e8765d97d5
21 changed files with 27 additions and 3552 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qtactiveqt.mk
View File

@ -4,7 +4,7 @@
PKG := qtactiveqt
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 56d1017d0afc02dfafbdc8ade3def4f845f7e481
$(PKG)_CHECKSUM := 20d46965fb8d28b6a1e175a057e58debbd65d7cb
$(PKG)_SUBDIR = $(subst qtbase,qtactiveqt,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtactiveqt,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtactiveqt,$(qtbase_URL))

3018
src/qtbase-1.patch
View File

File diff suppressed because it is too large Load Diff

6
src/qtbase.mk
View File

@ -3,11 +3,11 @@
PKG := qtbase
$(PKG)_IGNORE :=
$(PKG)_VERSION := 5.2.0-rc1
$(PKG)_CHECKSUM := 2577676eb37cec78d6d0864c094c7c8bb90a581e
$(PKG)_VERSION := 5.2.0
$(PKG)_CHECKSUM := 36cbda404e1fe27938a3d5778c757de96ff9f27a
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://download.qt-project.org/development_releases/qt/5.2/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
$(PKG)_URL := http://download.qt-project.org/official_releases/qt/5.2/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
$(PKG)_DEPS := gcc postgresql freetds openssl zlib libpng jpeg sqlite pcre fontconfig freetype dbus icu4c
define $(PKG)_UPDATE

2
src/qtconnectivity.mk
View File

@ -4,7 +4,7 @@
PKG := qtconnectivity
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 7c6258fd0c087357788c67744a69d84dd571a982
$(PKG)_CHECKSUM := fddd0996d14149a482830cbb7e8aaa2d3d32456f
$(PKG)_SUBDIR = $(subst qtbase,qtconnectivity,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtconnectivity,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtconnectivity,$(qtbase_URL))

2
src/qtdeclarative.mk
View File

@ -4,7 +4,7 @@
PKG := qtdeclarative
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 465187e014512761d13a314afc463817823456fd
$(PKG)_CHECKSUM := 2768fab8f3d81cfb67e101e94194cb4f90d4efa4
$(PKG)_SUBDIR = $(subst qtbase,qtdeclarative,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtdeclarative,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtdeclarative,$(qtbase_URL))

2
src/qtgraphicaleffects.mk
View File

@ -4,7 +4,7 @@
PKG := qtgraphicaleffects
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := b1443dd0c4d6bd681413d1366cd3a0ba840bcbe4
$(PKG)_CHECKSUM := 44a0ab24ae15270b22919ee1a8925ad119421560
$(PKG)_SUBDIR = $(subst qtbase,qtgraphicaleffects,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtgraphicaleffects,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtgraphicaleffects,$(qtbase_URL))

2
src/qtimageformats.mk
View File

@ -4,7 +4,7 @@
PKG := qtimageformats
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := f773b5592d464c8c6682576418f00a7f25631af9
$(PKG)_CHECKSUM := 2b68391c449343ac3c6579cb8e49bbdea1824b1d
$(PKG)_SUBDIR = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtimageformats,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtimageformats,$(qtbase_URL))

2
src/qtlocation.mk
View File

@ -4,7 +4,7 @@
PKG := qtlocation
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := d1951d132820e21c0eacfbf29d1149aa78f4e27a
$(PKG)_CHECKSUM := fabe92f954660719bd628be1811376b58ee4da29
$(PKG)_SUBDIR = $(subst qtbase,qtlocation,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtlocation,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtlocation,$(qtbase_URL))

266
src/qtmultimedia-1.patch
View File

@ -1,274 +1,10 @@
This file is part of MXE.
See index.html for further information.
From fd3efc0163d9963c91e24ece43b774c70ec57640 Mon Sep 17 00:00:00 2001
From: Yoann Lopes <yoann.lopes@digia.com>
Date: Wed, 27 Nov 2013 16:05:19 +0100
Subject: [PATCH 1/5] Android: print a warning when using SurfaceTexture on
Android 2.3.
SurfaceTexture is available since Android 3.0, print a warning when
camera preview or video playback is used on an older Android version.
Task-number: QTBUG-35075
Change-Id: Ie04c62df99048a25e8fd971e0708157d0d32c503
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
diff --git a/src/plugins/android/src/wrappers/jsurfacetexture.cpp b/src/plugins/android/src/wrappers/jsurfacetexture.cpp
index 1505443..47487f1 100644
--- a/src/plugins/android/src/wrappers/jsurfacetexture.cpp
+++ b/src/plugins/android/src/wrappers/jsurfacetexture.cpp
@@ -62,6 +62,8 @@ JSurfaceTexture::JSurfaceTexture(unsigned int texName)
{
if (isValid())
g_objectMap.insert(int(texName), this);
+ else // If the class is not available, it means the Android version is < 3.0
+ qWarning("Camera preview and video playback require Android 3.0 (API level 11) or later.");
}
JSurfaceTexture::~JSurfaceTexture()
@@ -94,16 +96,24 @@ static JNINativeMethod methods[] = {
bool JSurfaceTexture::initJNI(JNIEnv *env)
{
- jclass clazz = env->FindClass("org/qtproject/qt5/android/multimedia/QtSurfaceTexture");
+ // SurfaceTexture is available since API 11, try to find it first before loading
+ // our custom class
+ jclass surfaceTextureClass = env->FindClass("android/graphics/SurfaceTexture");
if (env->ExceptionCheck())
env->ExceptionClear();
- if (clazz) {
- g_qtSurfaceTextureClass = static_cast<jclass>(env->NewGlobalRef(clazz));
- if (env->RegisterNatives(g_qtSurfaceTextureClass,
- methods,
- sizeof(methods) / sizeof(methods[0])) < 0) {
- return false;
+ if (surfaceTextureClass) {
+ jclass clazz = env->FindClass("org/qtproject/qt5/android/multimedia/QtSurfaceTexture");
+ if (env->ExceptionCheck())
+ env->ExceptionClear();
+
+ if (clazz) {
+ g_qtSurfaceTextureClass = static_cast<jclass>(env->NewGlobalRef(clazz));
+ if (env->RegisterNatives(g_qtSurfaceTextureClass,
+ methods,
+ sizeof(methods) / sizeof(methods[0])) < 0) {
+ return false;
+ }
}
}
--
1.8.4
From e4654ca5ee255598269c0805507384c4a02ebdb2 Mon Sep 17 00:00:00 2001
From: Yoann Lopes <yoann.lopes@digia.com>
Date: Wed, 27 Nov 2013 18:01:56 +0100
Subject: [PATCH 2/5] Fix version availability for VideoOutput's
autoOrientation property.
This new property is available since 5.2, not 5.1.
Change-Id: Ie3b5cd3c5d909f6d4ba662a2eaf03f1e6bb8b21b
Reviewed-by: Tobias Koenig <tobias.koenig.qnx@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index d2bc829..f05252f 100644
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@ -76,7 +76,7 @@ public:
qmlRegisterType<QDeclarativeAudio>(uri, 5, 0, "Audio");
qmlRegisterType<QDeclarativeAudio>(uri, 5, 0, "MediaPlayer");
qmlRegisterType<QDeclarativeVideoOutput>(uri, 5, 0, "VideoOutput");
- qmlRegisterType<QDeclarativeVideoOutput, 1>(uri, 5, 1, "VideoOutput");
+ qmlRegisterType<QDeclarativeVideoOutput, 2>(uri, 5, 2, "VideoOutput");
qmlRegisterType<QDeclarativeRadio>(uri, 5, 0, "Radio");
qmlRegisterType<QDeclarativeRadioData>(uri, 5, 0, "RadioData");
qmlRegisterType<QDeclarativeCamera>(uri, 5, 0, "Camera");
diff --git a/src/imports/multimedia/qdeclarativevideooutput.cpp b/src/imports/multimedia/qdeclarativevideooutput.cpp
index 07c78b7..240dc46 100644
--- a/src/imports/multimedia/qdeclarativevideooutput.cpp
+++ b/src/imports/multimedia/qdeclarativevideooutput.cpp
@@ -429,7 +429,7 @@ void QDeclarativeVideoOutput::setOrientation(int orientation)
By default \c autoOrientation is disabled.
- \since QtMultimedia 5.1
+ \since QtMultimedia 5.2
*/
bool QDeclarativeVideoOutput::autoOrientation() const
{
diff --git a/src/imports/multimedia/qdeclarativevideooutput_p.h b/src/imports/multimedia/qdeclarativevideooutput_p.h
index 1de1fcc..07fdb41 100644
--- a/src/imports/multimedia/qdeclarativevideooutput_p.h
+++ b/src/imports/multimedia/qdeclarativevideooutput_p.h
@@ -62,7 +62,7 @@ class QDeclarativeVideoOutput : public QQuickItem
Q_PROPERTY(QObject* source READ source WRITE setSource NOTIFY sourceChanged)
Q_PROPERTY(FillMode fillMode READ fillMode WRITE setFillMode NOTIFY fillModeChanged)
Q_PROPERTY(int orientation READ orientation WRITE setOrientation NOTIFY orientationChanged)
- Q_PROPERTY(bool autoOrientation READ autoOrientation WRITE setAutoOrientation NOTIFY autoOrientationChanged REVISION 1)
+ Q_PROPERTY(bool autoOrientation READ autoOrientation WRITE setAutoOrientation NOTIFY autoOrientationChanged REVISION 2)
Q_PROPERTY(QRectF sourceRect READ sourceRect NOTIFY sourceRectChanged)
Q_PROPERTY(QRectF contentRect READ contentRect NOTIFY contentRectChanged)
Q_ENUMS(FillMode)
--
1.8.4
From 288e49d49308f84afa180086aebb9ce61738e626 Mon Sep 17 00:00:00 2001
From: Yoann Lopes <yoann.lopes@digia.com>
Date: Wed, 27 Nov 2013 19:20:27 +0100
Subject: [PATCH 3/5] Add changes-5.2.0 file.
Change-Id: Ieec89755a30996a5b0ed37ecaa6ee957344f8594
Reviewed-by: Sergio Ahumada <sahumada@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
diff --git a/dist/changes-5.2.0 b/dist/changes-5.2.0
new file mode 100644
index 0000000..e485659
--- /dev/null
+++ b/dist/changes-5.2.0
@@ -0,0 +1,86 @@
+Qt 5.2 introduces many new features and improvements as well as bugfixes
+over the 5.1.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+ http://qt-project.org/doc/qt-5.2
+
+The Qt version 5.2 series is binary compatible with the 5.1.x series.
+Applications compiled for 5.1 will continue to run with 5.2.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+ http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* General *
+****************************************************************************
+
+ - Improved ALSA implementation of the audio APIs.
+ - Improved WAV support in QSoundEffect.
+ - New resource policy plugin based on libresourceqt.
+ - Fix QVideoSurfaceArbFpPainter mistakenly failing to start in some cases.
+ - Improved QAudioRecorder implementation on Windows and Mac OS.
+ - Various documentation fixes.
+ - Improved audiorecorder example.
+ - [QTBUG-32487] Make PulseAudio implementation of QSoundEffect more robust.
+ - [QTBUG-32882] Enable QSoundEffect with loopCount of Infinite to play.
+ - [QTBUG-31731] WMF and GStreamer: fixed incorrect frame startTime and endTime.
+ - [QTBUG-30442] VideoOutput: take the video format's scanLineDirection into account.
+ - [QTBUG-34125] Correctly clear the current media in Audio and MediaPlayer qml elements.
+
+Qt for Android
+--------------
+
+ - New OpenSL ES plugin for low-latency audio support on Android.
+ - New camera support on Android.
+ - Improved video renderering with Qt Quick.
+ - Camera and recording permissions are now automatically added when using QtMultimedia on Android.
+ - [QTBUG-32635] Fixed media player buffering logic.
+ - [QTBUG-34558] Fix two race conditions in the media player.
+
+Qt for iOS
+----------
+
+ - New media player and basic camera support on iOS.
+
+Qt for BlackBerry
+-----------------
+
+ - Fix setting a URL containing reserved characters on a media player.
+ - Enable camera on the Playbook.
+ - New QAudioRecorder support.
+ - Fix video recording with BB 10.2.
+ - Improve camera focus handling.
+ - Fixed pixel aspect ratio for video windows.
+ - [QTBUG-33739] Fix camera viewfinder.
+
+Qt for Windows
+--------------
+
+ - WMF: emit positionChanged() signal when reaching the end of a media.
+ - [QTBUG-30776] DirectShow: improve metadata support.
+ - [QTBUG-33631][QTBUG-33518] WMF: allow to load media whose content doesn't match its file extension.
+ - [QTBUG-33518] WMF: allow to load QRC files with QAudioDecoder.
+ - [QTBUG-30435] WMF: fixed the media player failing to play some media formats.
+ - [QTBUG-32360] WMF: fixed compilation with Visual Studio 2008.
+ - [QTBUG-34479] DirectShow: fixed compilation with Visual Studio 2008.
+ - [QTBUG-32864] WMF: fixed compilation on Windows Vista.
+ - [QTBUG-30825] WMF: fixed QMediaPlayer changing to EndOfMedia status too early.
+ - [QTBUG-33160] Fix QAudioOutput::setVolume() limited to 50% on 32-bit Windows.
+
+Qt for QNX
+----------
+
+ - New camera and media player support when mmrenderer is available.
+
+****************************************************************************
+* Plugins *
+****************************************************************************
+
+ - New QML import version QtMultimedia 5.2 adds a new autoOrientation
+ property to the VideoOutput type, which allows the video output to
+ always match the screen orientation.
--
1.8.4
From ea9f9788d502d4a4307a464d87a00be198df09ad Mon Sep 17 00:00:00 2001
From: Frank Osterfeld <frank.osterfeld.qnx@kdab.com>
Date: Thu, 28 Nov 2013 10:27:46 +0100
Subject: [PATCH 4/5] QNX/PPS: Fix end-of-track handling
The state to check for is actually "stopped", not "STOPPED".
Fixes end-of-track detection.
Task-number: QTBUG-35189
Change-Id: Ifa2f0635b31ef8c584c1800ef870c0dbef2b1daf
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Tobias Koenig <tobias.koenig.qnx@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
diff --git a/src/plugins/qnx/mediaplayer/ppsmediaplayercontrol.cpp b/src/plugins/qnx/mediaplayer/ppsmediaplayercontrol.cpp
index eb0842f..b54c796 100644
--- a/src/plugins/qnx/mediaplayer/ppsmediaplayercontrol.cpp
+++ b/src/plugins/qnx/mediaplayer/ppsmediaplayercontrol.cpp
@@ -57,7 +57,7 @@ PpsMediaPlayerControl::PpsMediaPlayerControl(QObject *parent)
m_ppsStatusFd(-1),
m_ppsStateNotifier(0),
m_ppsStateFd(-1)
- , m_previouslySeenState("STOPPED")
+ , m_previouslySeenState("stopped")
{
openConnection();
}
@@ -177,7 +177,7 @@ void PpsMediaPlayerControl::ppsReadyRead(int fd)
if (pps_decoder_get_string(&decoder, "state", &value) == PPS_DECODER_OK) {
const QByteArray state = value;
- if (state != m_previouslySeenState && state == "STOPPED")
+ if (state != m_previouslySeenState && state == "stopped")
handleMmStopped();
m_previouslySeenState = state;
}
--
1.8.4
From b3ca574eaada965dbd20a90f89c3eb524627321a Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 13 Dec 2012 20:23:48 +0100
Subject: [PATCH 5/5] 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

@ -4,7 +4,7 @@
PKG := qtmultimedia
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 28b9c29b80f178784de7198ae76c011acacf3153
$(PKG)_CHECKSUM := 5bcb23814542dc73901fcb97331afb4bb06caf73
$(PKG)_SUBDIR = $(subst qtbase,qtmultimedia,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtmultimedia,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtmultimedia,$(qtbase_URL))

2
src/qtquick1.mk
View File

@ -4,7 +4,7 @@
PKG := qtquick1
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := a3e6784bf7b62deb770d4b8185ea4af972feb65b
$(PKG)_CHECKSUM := 259ba637af0d6be6d25da1e1e24be9cfe978e2e0
$(PKG)_SUBDIR = $(subst qtbase,qtquick1,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtquick1,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtquick1,$(qtbase_URL))

2
src/qtquickcontrols.mk
View File

@ -4,7 +4,7 @@
PKG := qtquickcontrols
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 7688217ba95c0c7590ab2e01fb0e97340ea2db99
$(PKG)_CHECKSUM := c0ed05af06a89074f330814c397815a0acaf8042
$(PKG)_SUBDIR = $(subst qtbase,qtquickcontrols,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtquickcontrols,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtquickcontrols,$(qtbase_URL))

2
src/qtscript.mk
View File

@ -4,7 +4,7 @@
PKG := qtscript
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := eb7874c4315872a6dd2b4805635f15c4d9ab391b
$(PKG)_CHECKSUM := 7cdfb46b76d75475108970194d0aceb78b26db91
$(PKG)_SUBDIR = $(subst qtbase,qtscript,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtscript,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtscript,$(qtbase_URL))

2
src/qtsensors.mk
View File

@ -4,7 +4,7 @@
PKG := qtsensors
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 0b1f51b4aebe39727e241aad5ceea8752cfee4a9
$(PKG)_CHECKSUM := 65baf9623452f787c4526ff462feb94ff5d3104f
$(PKG)_SUBDIR = $(subst qtbase,qtsensors,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtsensors,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtsensors,$(qtbase_URL))

2
src/qtserialport.mk
View File

@ -4,7 +4,7 @@
PKG := qtserialport
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := d510b0dde86f17ef69600325ec1738472737eefa
$(PKG)_CHECKSUM := 55e94b94658464ba6bb9f83bbbe34ca5f13f24e1
$(PKG)_SUBDIR = $(subst qtbase,qtserialport,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtserialport,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtserialport,$(qtbase_URL))

2
src/qtsvg.mk
View File

@ -4,7 +4,7 @@
PKG := qtsvg
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := ca0ae973d62c99da1a222f9a3c641811c49677a3
$(PKG)_CHECKSUM := c57a83786f6509b1e8bbd3514727f1d63f32a214
$(PKG)_SUBDIR = $(subst qtbase,qtsvg,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtsvg,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtsvg,$(qtbase_URL))

2
src/qttools.mk
View File

@ -4,7 +4,7 @@
PKG := qttools
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 0e11e5d4fa8c63d1967e62c7a007959b2d07ae89
$(PKG)_CHECKSUM := bbca64f6c1c895ae463004e8963a3b5af72106ee
$(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL))

2
src/qttranslations.mk
View File

@ -4,7 +4,7 @@
PKG := qttranslations
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 4c46bb1bfd141ccb52e8db173198869cdb83a17d
$(PKG)_CHECKSUM := c25f6a541492308b15c7104bf982192afe55b0ab
$(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL))

255
src/qtwinextras-1.patch
View File

@ -1,263 +1,10 @@
This file is part of MXE.
See index.html for further information.
From ed4d73908be1a077bec94ba669e5e46d6d422818 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@digia.com>
Date: Thu, 28 Nov 2013 16:48:37 +0100
Subject: [PATCH 1/3] Add plugins.qmltypes file
Task-number: QTBUG-35207
Change-Id: If6843d71c2d6e0a9afec3dca3683ac0fcd1188b6
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
diff --git a/src/imports/winextras/plugins.qmltypes b/src/imports/winextras/plugins.qmltypes
new file mode 100644
index 0000000..f5963ce
--- /dev/null
+++ b/src/imports/winextras/plugins.qmltypes
@@ -0,0 +1,207 @@
+import QtQuick.tooling 1.1
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -nonrelocatable QtWinExtras 1.0'
+
+Module {
+ Component {
+ name: "QQuickDwmFeatures"
+ defaultProperty: "data"
+ prototype: "QQuickItem"
+ exports: ["QtWinExtras/DwmFeatures 1.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "compositionEnabled"; type: "bool" }
+ Property { name: "colorizationColor"; type: "QColor"; isReadonly: true }
+ Property { name: "realColorizationColor"; type: "QColor"; isReadonly: true }
+ Property { name: "colorizationOpaqueBlend"; type: "bool"; isReadonly: true }
+ Property { name: "topGlassMargin"; type: "int" }
+ Property { name: "rightGlassMargin"; type: "int" }
+ Property { name: "bottomGlassMargin"; type: "int" }
+ Property { name: "leftGlassMargin"; type: "int" }
+ Property { name: "blurBehindEnabled"; type: "bool" }
+ Property { name: "excludedFromPeek"; type: "bool" }
+ Property { name: "peekDisallowed"; type: "bool" }
+ Property { name: "flip3DPolicy"; type: "QQuickWin::WindowFlip3DPolicy" }
+ }
+ Component {
+ name: "QQuickJumpList"
+ defaultProperty: "data"
+ prototype: "QObject"
+ exports: ["QtWinExtras/JumpList 1.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "recent"; type: "QQuickJumpListCategory"; isReadonly: true; isPointer: true }
+ Property { name: "frequent"; type: "QQuickJumpListCategory"; isReadonly: true; isPointer: true }
+ Property { name: "tasks"; type: "QQuickJumpListCategory"; isPointer: true }
+ Property { name: "categories"; type: "QQuickJumpListCategory"; isList: true; isReadonly: true }
+ Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
+ }
+ Component {
+ name: "QQuickJumpListCategory"
+ defaultProperty: "data"
+ prototype: "QObject"
+ exports: ["QtWinExtras/JumpListCategory 1.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
+ Property { name: "items"; type: "QQuickJumpListItem"; isList: true; isReadonly: true }
+ Property { name: "title"; type: "string" }
+ Property { name: "visible"; type: "bool" }
+ Signal { name: "visibilityChanged" }
+ }
+ Component {
+ name: "QQuickJumpListItem"
+ prototype: "QObject"
+ exports: ["QtWinExtras/JumpListItem 1.0"]
+ exportMetaObjectRevisions: [0]
+ Enum {
+ name: "JumpListItemType"
+ values: {
+ "ItemTypeLink": 1,
+ "ItemTypeDestination": 2,
+ "ItemTypeSeparator": 3
+ }
+ }
+ Property { name: "__jumpListItemType"; type: "int" }
+ }
+ Component {
+ name: "QQuickTaskbarButton"
+ defaultProperty: "data"
+ prototype: "QQuickItem"
+ exports: ["QtWinExtras/TaskbarButton 1.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "overlay"; type: "QQuickTaskbarOverlay"; isReadonly: true; isPointer: true }
+ Property { name: "progress"; type: "QWinTaskbarProgress"; isReadonly: true; isPointer: true }
+ }
+ Component {
+ name: "QQuickTaskbarOverlay"
+ prototype: "QObject"
+ exports: ["QtWinExtras/TaskbarOverlay 1.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "iconSource"; type: "QUrl" }
+ Property { name: "accessibleDescription"; type: "string" }
+ }
+ Component {
+ name: "QQuickThumbnailToolBar"
+ defaultProperty: "data"
+ prototype: "QQuickItem"
+ exports: ["QtWinExtras/ThumbnailToolBar 1.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "count"; type: "int"; isReadonly: true }
+ Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
+ Property { name: "buttons"; type: "QQuickThumbnailToolButton"; isList: true; isReadonly: true }
+ Method { name: "clear" }
+ Method {
+ name: "addButton"
+ Parameter { name: "button"; type: "QQuickThumbnailToolButton"; isPointer: true }
+ }
+ Method {
+ name: "removeButton"
+ Parameter { name: "button"; type: "QQuickThumbnailToolButton"; isPointer: true }
+ }
+ }
+ Component {
+ name: "QQuickThumbnailToolButton"
+ prototype: "QObject"
+ exports: ["QtWinExtras/ThumbnailToolButton 1.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "iconSource"; type: "QUrl" }
+ Property { name: "tooltip"; type: "string" }
+ Property { name: "enabled"; type: "bool" }
+ Property { name: "interactive"; type: "bool" }
+ Property { name: "visible"; type: "bool" }
+ Property { name: "dismissOnClick"; type: "bool" }
+ Property { name: "flat"; type: "bool" }
+ Signal { name: "clicked" }
+ }
+ Component {
+ name: "QQuickWin"
+ prototype: "QObject"
+ exports: ["QtWinExtras/QtWin 1.0"]
+ exportMetaObjectRevisions: [0]
+ Enum {
+ name: "HBitmapFormat"
+ values: {
+ "HBitmapNoAlpha": 0,
+ "HBitmapPremultipliedAlpha": 1,
+ "HBitmapAlpha": 2
+ }
+ }
+ Enum {
+ name: "WindowFlip3DPolicy"
+ values: {
+ "FlipDefault": 0,
+ "FlipExcludeBelow": 1,
+ "FlipExcludeAbove": 2
+ }
+ }
+ }
+ Component {
+ name: "QWinTaskbarProgress"
+ prototype: "QObject"
+ exports: ["QtWinExtras/TaskbarProgress 1.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "value"; type: "int" }
+ Property { name: "minimum"; type: "int" }
+ Property { name: "maximum"; type: "int" }
+ Property { name: "visible"; type: "bool" }
+ Property { name: "paused"; type: "bool" }
+ Property { name: "stopped"; type: "bool"; isReadonly: true }
+ Signal {
+ name: "valueChanged"
+ Parameter { name: "value"; type: "int" }
+ }
+ Signal {
+ name: "minimumChanged"
+ Parameter { name: "minimum"; type: "int" }
+ }
+ Signal {
+ name: "maximumChanged"
+ Parameter { name: "maximum"; type: "int" }
+ }
+ Signal {
+ name: "visibilityChanged"
+ Parameter { name: "visible"; type: "bool" }
+ }
+ Signal {
+ name: "pausedChanged"
+ Parameter { name: "paused"; type: "bool" }
+ }
+ Signal {
+ name: "stoppedChanged"
+ Parameter { name: "stopped"; type: "bool" }
+ }
+ Method {
+ name: "setValue"
+ Parameter { name: "value"; type: "int" }
+ }
+ Method {
+ name: "setMinimum"
+ Parameter { name: "minimum"; type: "int" }
+ }
+ Method {
+ name: "setMaximum"
+ Parameter { name: "maximum"; type: "int" }
+ }
+ Method {
+ name: "setRange"
+ Parameter { name: "minimum"; type: "int" }
+ Parameter { name: "maximum"; type: "int" }
+ }
+ Method { name: "reset" }
+ Method { name: "show" }
+ Method { name: "hide" }
+ Method {
+ name: "setVisible"
+ Parameter { name: "visible"; type: "bool" }
+ }
+ Method { name: "pause" }
+ Method { name: "resume" }
+ Method {
+ name: "setPaused"
+ Parameter { name: "paused"; type: "bool" }
+ }
+ Method { name: "stop" }
+ }
+}
--
1.8.4
From c996740162dd63fa20e549e57c78ca990b2ca1c2 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Mon, 2 Dec 2013 16:38:50 +0200
Subject: [PATCH 2/3] Add missing include for QQuickDwmFeatures plugin.
Task-number: QTBUG-35260
Change-Id: I8145fd8a98b8549de7e819740e6b7529d0785488
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
diff --git a/src/imports/winextras/qquickdwmfeatures_p.h b/src/imports/winextras/qquickdwmfeatures_p.h
index 231424a..037872f 100644
--- a/src/imports/winextras/qquickdwmfeatures_p.h
+++ b/src/imports/winextras/qquickdwmfeatures_p.h
@@ -45,6 +45,7 @@
#include <QQuickItem>
#include <QtWin>
+#include <QColor>
#include "qquickwin_p.h"
--
1.8.4
From bb7d4141f14dfd22365df4991a066e9b760b088d Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 24 Oct 2013 22:29:51 +0200
Subject: [PATCH 3/3] Fix MinGW-w64 GCC 4.8.2 compilation
Subject: [PATCH] Fix MinGW-w64 GCC 4.8.2 compilation
diff --git a/src/winextras/winshobjidl_p.h b/src/winextras/winshobjidl_p.h

2
src/qtwinextras.mk
View File

@ -4,7 +4,7 @@
PKG := qtwinextras
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 3e2acdbbfc273864d9aba43c8db31463a5932075
$(PKG)_CHECKSUM := a2f77bd69666dedfb41402ab8ffb6f7c52673ad1
$(PKG)_SUBDIR = $(subst qtbase,qtwinextras,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtwinextras,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtwinextras,$(qtbase_URL))

2
src/qtxmlpatterns.mk
View File

@ -4,7 +4,7 @@
PKG := qtxmlpatterns
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 1e8dd3a300dc5e326baace0825292cd9519fea24
$(PKG)_CHECKSUM := aaa115d6c23c9a00cb20115fde0fb899d2fe8135
$(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL))