diff options
author | Mark Brand <mabrand@mabrand.nl> | 2013-02-01 12:25:30 (GMT) |
---|---|---|
committer | Mark Brand <mabrand@mabrand.nl> | 2013-02-01 12:28:16 (GMT) |
commit | bac9557741106f3748bb149b45e1c83de56c3b7a (patch) | |
tree | ae867521ba400573098df3f2521e9e123c545d95 /src | |
parent | 0ecf58730bee9bb2b2e4bc39491783194224e11a (diff) | |
download | mxe-bac9557741106f3748bb149b45e1c83de56c3b7a.zip mxe-bac9557741106f3748bb149b45e1c83de56c3b7a.tar.gz mxe-bac9557741106f3748bb149b45e1c83de56c3b7a.tar.bz2 |
package qttools: add upstream build fix
Diffstat (limited to 'src')
-rw-r--r-- | src/qttools-1.cherrypicks.patch | 322 |
1 files changed, 322 insertions, 0 deletions
diff --git a/src/qttools-1.cherrypicks.patch b/src/qttools-1.cherrypicks.patch new file mode 100644 index 0000000..23448ce --- /dev/null +++ b/src/qttools-1.cherrypicks.patch @@ -0,0 +1,322 @@ +This file is part of MXE. +See index.html for further information. + +From 5e944491034ddd8d08b51602d3de2d55b845122c Mon Sep 17 00:00:00 2001 +From: Friedemann Kleint <Friedemann.Kleint@digia.com> +Date: Fri, 1 Feb 2013 09:34:41 +0100 +Subject: [PATCH 1/3] QtDBus-tools: Remove module includes. + +Change-Id: I4b6754c7bd513a2c479c52a0428bd7eee857c6ca + +diff --git a/src/qdbus/qdbus/qdbus.cpp b/src/qdbus/qdbus/qdbus.cpp +index 0ce6563..345f046 100644 +--- a/src/qdbus/qdbus/qdbus.cpp ++++ b/src/qdbus/qdbus/qdbus.cpp +@@ -47,7 +47,13 @@ + #include <QtCore/qmetaobject.h> + #include <QtXml/QDomDocument> + #include <QtXml/QDomElement> +-#include <QtDBus/QtDBus> ++#include <QtDBus/QDBusConnection> ++#include <QtDBus/QDBusInterface> ++#include <QtDBus/QDBusConnectionInterface> ++#include <QtDBus/QDBusVariant> ++#include <QtDBus/QDBusArgument> ++#include <QtDBus/QDBusMessage> ++#include <QtDBus/QDBusReply> + #include <private/qdbusutil_p.h> + + QT_BEGIN_NAMESPACE +diff --git a/src/qdbus/qdbusviewer/qdbusmodel.cpp b/src/qdbus/qdbusviewer/qdbusmodel.cpp +index e2405a1..5bf656b 100644 +--- a/src/qdbus/qdbusviewer/qdbusmodel.cpp ++++ b/src/qdbus/qdbusviewer/qdbusmodel.cpp +@@ -42,7 +42,11 @@ + #include "qdbusmodel.h" + + #include <QtCore/qvector.h> +-#include <QtXml/QtXml> ++#include <QtCore/QDebug> ++#include <QtXml/QDomDocument> ++#include <QtDBus/QDBusObjectPath> ++#include <QtDBus/QDBusInterface> ++#include <QtDBus/QDBusReply> + + struct QDBusItem + { +diff --git a/src/qdbus/qdbusviewer/qdbusmodel.h b/src/qdbus/qdbusviewer/qdbusmodel.h +index d9db699..f6b1366 100644 +--- a/src/qdbus/qdbusviewer/qdbusmodel.h ++++ b/src/qdbus/qdbusviewer/qdbusmodel.h +@@ -43,12 +43,13 @@ + #define QDBUSMODEL_H + + #include <QtCore/qabstractitemmodel.h> +-#include <QtDBus/QtDBus> ++#include <QtDBus/QDBusConnection> + + struct QDBusItem; + + QT_FORWARD_DECLARE_CLASS(QDomDocument); + QT_FORWARD_DECLARE_CLASS(QDomElement); ++QT_FORWARD_DECLARE_CLASS(QDBusObjectPath) + + + class QDBusModel: public QAbstractItemModel +diff --git a/src/qdbus/qdbusviewer/qdbusviewer.cpp b/src/qdbus/qdbusviewer/qdbusviewer.cpp +index c6d8f1f..95072fb 100644 +--- a/src/qdbus/qdbusviewer/qdbusviewer.cpp ++++ b/src/qdbus/qdbusviewer/qdbusviewer.cpp +@@ -43,11 +43,11 @@ + #include "qdbusmodel.h" + #include "propertydialog.h" + +-#include <QtXml/QtXml> + + #include <QtWidgets/QTreeWidget> + #include <QtCore/QStringListModel> + #include <QtCore/QSortFilterProxyModel> ++#include <QtCore/QMetaProperty> + #include <QtWidgets/QLineEdit> + #include <QtWidgets/QListView> + #include <QtWidgets/QTextBrowser> +@@ -58,6 +58,9 @@ + #include <QtWidgets/QInputDialog> + #include <QtWidgets/QMessageBox> + #include <QtWidgets/QMenu> ++#include <QtDBus/QDBusConnectionInterface> ++#include <QtDBus/QDBusInterface> ++#include <QtDBus/QDBusMetaType> + + #include <private/qdbusutil_p.h> + +diff --git a/src/qdbus/qdbusviewer/qdbusviewer.h b/src/qdbus/qdbusviewer/qdbusviewer.h +index cbfcb68..00e166a 100644 +--- a/src/qdbus/qdbusviewer/qdbusviewer.h ++++ b/src/qdbus/qdbusviewer/qdbusviewer.h +@@ -43,7 +43,7 @@ + #define QDBUSVIEWER_H + + #include <QtWidgets/QWidget> +-#include <QtDBus/QtDBus> ++#include <QtDBus/QDBusConnection> + + QT_FORWARD_DECLARE_CLASS(QTreeView) + QT_FORWARD_DECLARE_CLASS(QTreeWidget) +-- +1.7.10.4 + + +From 300119c1d0b2e6bfa329e42bd7ada1184f801468 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Fri, 1 Feb 2013 13:17:44 +0100 +Subject: [PATCH 2/3] Revert "QtDBus-tools: Remove module includes." + +This reverts commit 5e944491034ddd8d08b51602d3de2d55b845122c. + +diff --git a/src/qdbus/qdbus/qdbus.cpp b/src/qdbus/qdbus/qdbus.cpp +index 345f046..0ce6563 100644 +--- a/src/qdbus/qdbus/qdbus.cpp ++++ b/src/qdbus/qdbus/qdbus.cpp +@@ -47,13 +47,7 @@ + #include <QtCore/qmetaobject.h> + #include <QtXml/QDomDocument> + #include <QtXml/QDomElement> +-#include <QtDBus/QDBusConnection> +-#include <QtDBus/QDBusInterface> +-#include <QtDBus/QDBusConnectionInterface> +-#include <QtDBus/QDBusVariant> +-#include <QtDBus/QDBusArgument> +-#include <QtDBus/QDBusMessage> +-#include <QtDBus/QDBusReply> ++#include <QtDBus/QtDBus> + #include <private/qdbusutil_p.h> + + QT_BEGIN_NAMESPACE +diff --git a/src/qdbus/qdbusviewer/qdbusmodel.cpp b/src/qdbus/qdbusviewer/qdbusmodel.cpp +index 5bf656b..e2405a1 100644 +--- a/src/qdbus/qdbusviewer/qdbusmodel.cpp ++++ b/src/qdbus/qdbusviewer/qdbusmodel.cpp +@@ -42,11 +42,7 @@ + #include "qdbusmodel.h" + + #include <QtCore/qvector.h> +-#include <QtCore/QDebug> +-#include <QtXml/QDomDocument> +-#include <QtDBus/QDBusObjectPath> +-#include <QtDBus/QDBusInterface> +-#include <QtDBus/QDBusReply> ++#include <QtXml/QtXml> + + struct QDBusItem + { +diff --git a/src/qdbus/qdbusviewer/qdbusmodel.h b/src/qdbus/qdbusviewer/qdbusmodel.h +index f6b1366..d9db699 100644 +--- a/src/qdbus/qdbusviewer/qdbusmodel.h ++++ b/src/qdbus/qdbusviewer/qdbusmodel.h +@@ -43,13 +43,12 @@ + #define QDBUSMODEL_H + + #include <QtCore/qabstractitemmodel.h> +-#include <QtDBus/QDBusConnection> ++#include <QtDBus/QtDBus> + + struct QDBusItem; + + QT_FORWARD_DECLARE_CLASS(QDomDocument); + QT_FORWARD_DECLARE_CLASS(QDomElement); +-QT_FORWARD_DECLARE_CLASS(QDBusObjectPath) + + + class QDBusModel: public QAbstractItemModel +diff --git a/src/qdbus/qdbusviewer/qdbusviewer.cpp b/src/qdbus/qdbusviewer/qdbusviewer.cpp +index 95072fb..c6d8f1f 100644 +--- a/src/qdbus/qdbusviewer/qdbusviewer.cpp ++++ b/src/qdbus/qdbusviewer/qdbusviewer.cpp +@@ -43,11 +43,11 @@ + #include "qdbusmodel.h" + #include "propertydialog.h" + ++#include <QtXml/QtXml> + + #include <QtWidgets/QTreeWidget> + #include <QtCore/QStringListModel> + #include <QtCore/QSortFilterProxyModel> +-#include <QtCore/QMetaProperty> + #include <QtWidgets/QLineEdit> + #include <QtWidgets/QListView> + #include <QtWidgets/QTextBrowser> +@@ -58,9 +58,6 @@ + #include <QtWidgets/QInputDialog> + #include <QtWidgets/QMessageBox> + #include <QtWidgets/QMenu> +-#include <QtDBus/QDBusConnectionInterface> +-#include <QtDBus/QDBusInterface> +-#include <QtDBus/QDBusMetaType> + + #include <private/qdbusutil_p.h> + +diff --git a/src/qdbus/qdbusviewer/qdbusviewer.h b/src/qdbus/qdbusviewer/qdbusviewer.h +index 00e166a..cbfcb68 100644 +--- a/src/qdbus/qdbusviewer/qdbusviewer.h ++++ b/src/qdbus/qdbusviewer/qdbusviewer.h +@@ -43,7 +43,7 @@ + #define QDBUSVIEWER_H + + #include <QtWidgets/QWidget> +-#include <QtDBus/QDBusConnection> ++#include <QtDBus/QtDBus> + + QT_FORWARD_DECLARE_CLASS(QTreeView) + QT_FORWARD_DECLARE_CLASS(QTreeWidget) +-- +1.7.10.4 + + +From bf1ac3e16e50549c0bcf9b8bf89a5429d2376a1b Mon Sep 17 00:00:00 2001 +From: Friedemann Kleint <Friedemann.Kleint@digia.com> +Date: Fri, 1 Feb 2013 09:34:41 +0100 +Subject: [PATCH 3/3] QtDBus-tools: Remove module includes. + +Change-Id: I4b6754c7bd513a2c479c52a0428bd7eee857c6ca +Reviewed-by: Kai Koehne <kai.koehne@digia.com> +(cherry picked from commit 6463881156d05b0e39bbca91f2d0c5892b0a9368) + +diff --git a/src/qdbus/qdbus/qdbus.cpp b/src/qdbus/qdbus/qdbus.cpp +index 0ce6563..345f046 100644 +--- a/src/qdbus/qdbus/qdbus.cpp ++++ b/src/qdbus/qdbus/qdbus.cpp +@@ -47,7 +47,13 @@ + #include <QtCore/qmetaobject.h> + #include <QtXml/QDomDocument> + #include <QtXml/QDomElement> +-#include <QtDBus/QtDBus> ++#include <QtDBus/QDBusConnection> ++#include <QtDBus/QDBusInterface> ++#include <QtDBus/QDBusConnectionInterface> ++#include <QtDBus/QDBusVariant> ++#include <QtDBus/QDBusArgument> ++#include <QtDBus/QDBusMessage> ++#include <QtDBus/QDBusReply> + #include <private/qdbusutil_p.h> + + QT_BEGIN_NAMESPACE +diff --git a/src/qdbus/qdbusviewer/qdbusmodel.cpp b/src/qdbus/qdbusviewer/qdbusmodel.cpp +index e2405a1..5bf656b 100644 +--- a/src/qdbus/qdbusviewer/qdbusmodel.cpp ++++ b/src/qdbus/qdbusviewer/qdbusmodel.cpp +@@ -42,7 +42,11 @@ + #include "qdbusmodel.h" + + #include <QtCore/qvector.h> +-#include <QtXml/QtXml> ++#include <QtCore/QDebug> ++#include <QtXml/QDomDocument> ++#include <QtDBus/QDBusObjectPath> ++#include <QtDBus/QDBusInterface> ++#include <QtDBus/QDBusReply> + + struct QDBusItem + { +diff --git a/src/qdbus/qdbusviewer/qdbusmodel.h b/src/qdbus/qdbusviewer/qdbusmodel.h +index d9db699..f6b1366 100644 +--- a/src/qdbus/qdbusviewer/qdbusmodel.h ++++ b/src/qdbus/qdbusviewer/qdbusmodel.h +@@ -43,12 +43,13 @@ + #define QDBUSMODEL_H + + #include <QtCore/qabstractitemmodel.h> +-#include <QtDBus/QtDBus> ++#include <QtDBus/QDBusConnection> + + struct QDBusItem; + + QT_FORWARD_DECLARE_CLASS(QDomDocument); + QT_FORWARD_DECLARE_CLASS(QDomElement); ++QT_FORWARD_DECLARE_CLASS(QDBusObjectPath) + + + class QDBusModel: public QAbstractItemModel +diff --git a/src/qdbus/qdbusviewer/qdbusviewer.cpp b/src/qdbus/qdbusviewer/qdbusviewer.cpp +index c6d8f1f..95072fb 100644 +--- a/src/qdbus/qdbusviewer/qdbusviewer.cpp ++++ b/src/qdbus/qdbusviewer/qdbusviewer.cpp +@@ -43,11 +43,11 @@ + #include "qdbusmodel.h" + #include "propertydialog.h" + +-#include <QtXml/QtXml> + + #include <QtWidgets/QTreeWidget> + #include <QtCore/QStringListModel> + #include <QtCore/QSortFilterProxyModel> ++#include <QtCore/QMetaProperty> + #include <QtWidgets/QLineEdit> + #include <QtWidgets/QListView> + #include <QtWidgets/QTextBrowser> +@@ -58,6 +58,9 @@ + #include <QtWidgets/QInputDialog> + #include <QtWidgets/QMessageBox> + #include <QtWidgets/QMenu> ++#include <QtDBus/QDBusConnectionInterface> ++#include <QtDBus/QDBusInterface> ++#include <QtDBus/QDBusMetaType> + + #include <private/qdbusutil_p.h> + +diff --git a/src/qdbus/qdbusviewer/qdbusviewer.h b/src/qdbus/qdbusviewer/qdbusviewer.h +index cbfcb68..00e166a 100644 +--- a/src/qdbus/qdbusviewer/qdbusviewer.h ++++ b/src/qdbus/qdbusviewer/qdbusviewer.h +@@ -43,7 +43,7 @@ + #define QDBUSVIEWER_H + + #include <QtWidgets/QWidget> +-#include <QtDBus/QtDBus> ++#include <QtDBus/QDBusConnection> + + QT_FORWARD_DECLARE_CLASS(QTreeView) + QT_FORWARD_DECLARE_CLASS(QTreeWidget) +-- +1.7.10.4 + |