qt5-creator: Fix build with NO_ACCESSIBILITY

Also add missing headers in sources

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
2017-07-12 14:15:01 -07:00
committed by Martin Jansa
parent 2afd1b77be
commit 92c634e9d5
3 changed files with 81 additions and 0 deletions

View File

@@ -0,0 +1,38 @@
From 429347dda56a4d45dc03fee2362eb02294161bfd Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Fri, 24 Jun 2016 10:23:24 +0200
Subject: [PATCH] Fix compilation with QT_NO_ACCESSIBILITY
Task-number: QTCREATORBUG-16446
Change-Id: If75122c23a697f26ccf56391fe2e8d316aad6367
Reviewed-by: hjk <hjk@theqtcompany.com>
---
src/libs/utils/fancymainwindow.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp
index 9477f17..1ee425f 100644
--- a/src/libs/utils/fancymainwindow.cpp
+++ b/src/libs/utils/fancymainwindow.cpp
@@ -159,13 +159,16 @@ public:
m_floatButton = new DockWidgetTitleButton(this);
m_floatButton->setIcon(q->style()->standardIcon(QStyle::SP_TitleBarNormalButton, &opt, q));
- m_floatButton->setAccessibleName(QDockWidget::tr("Float"));
- m_floatButton->setAccessibleDescription(QDockWidget::tr("Undocks and re-attaches the dock widget"));
m_closeButton = new DockWidgetTitleButton(this);
m_closeButton->setIcon(q->style()->standardIcon(QStyle::SP_TitleBarCloseButton, &opt, q));
+
+#ifndef QT_NO_ACCESSIBILITY
+ m_floatButton->setAccessibleName(QDockWidget::tr("Float"));
+ m_floatButton->setAccessibleDescription(QDockWidget::tr("Undocks and re-attaches the dock widget"));
m_closeButton->setAccessibleName(QDockWidget::tr("Close"));
m_closeButton->setAccessibleDescription(QDockWidget::tr("Closes the dock widget"));
+#endif
setActive(false);
--
2.13.2

View File

@@ -0,0 +1,41 @@
From 51088a424416a8ca5cdf5161b792ac5e8a01f749 Mon Sep 17 00:00:00 2001
From: Marco Benelli <marco.benelli@qt.io>
Date: Thu, 6 Jul 2017 09:31:41 +0200
Subject: [PATCH] Qmlpuppet: add missing includes
Task-number: QTCREATORBUG-18498
Change-Id: Ie40a066508bb52f53b8ad528f9d4cf6969fc0632
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
.../qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp | 2 ++
.../qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp | 1 +
2 files changed, 3 insertions(+)
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp
index 3f9f148..160e5c4 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp
@@ -29,6 +29,8 @@
****************************************************************************/
#include "layoutnodeinstance.h"
+#include <QCoreApplication>
+
namespace QmlDesigner {
namespace Internal {
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
index 5a9342f..bacbc12 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
@@ -33,6 +33,7 @@
#include <enumeration.h>
#include <qmlprivategate.h>
+#include <QDebug>
#include <QEvent>
#include <QQmlContext>
#include <QQmlError>
--
2.13.2

View File

@@ -21,6 +21,8 @@ DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qtto
SRC_URI = " \
http://download.qt.io/official_releases/qtcreator/3.5/${PV}/qt-creator-opensource-src-${PV}.tar.gz \
file://0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch \
file://0001-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch \
file://0001-Qmlpuppet-add-missing-includes.patch \
file://qtcreator.desktop.in \
"
SRC_URI[md5sum] = "77aef7df837eba07c7ce6037ee504c05"