feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.5'

Browse Source 
Conflicts:
	scripts/deployqtHelper_mac.sh

Change-Id: Ia0d5fef8c28e0bfb3b0c703ad3652e2d70d9e7d1
This commit is contained in:
Oswald Buddenhagen
2015-07-17 17:25:26 +02:00
parent 893dfade18 503e4a08cb
commit ddea5994f3
133 changed files with 1755 additions and 1198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
+1 -1
View File
@@ -83,7 +83,7 @@
#include <QMutableVectorIterator>
#include <QQuickView>
#include <designersupport.h>
#include <designersupportdelegate.h>
namespace {
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
+1 -1
View File
@@ -63,7 +63,7 @@
#include "dummycontextobject.h"
#include <designersupport.h>
#include <designersupportdelegate.h>
namespace QmlDesigner {
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp
+1 -1
View File
@@ -37,7 +37,7 @@
#include "qt5rendernodeinstanceserver.h"
#include "qt5testnodeinstanceserver.h"
#include <designersupport.h>
#include <designersupportdelegate.h>
#if defined(Q_OS_UNIX)
#include <unistd.h>
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
+1 -1
View File
@@ -34,7 +34,7 @@
#include <QQuickItem>
#include <QQuickView>
#include <designersupport.h>
#include <designersupportdelegate.h>
#include <addimportcontainer.h>
#include <createscenecommand.h>
#include <reparentinstancescommand.h>
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h
+1 -1
View File
@@ -34,7 +34,7 @@
#include <QtGlobal>
#include "nodeinstanceserver.h"
#include "designersupport.h"
#include <designersupportdelegate.h>
QT_BEGIN_NAMESPACE
class QQuickItem;
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp
+1 -1
View File
@@ -36,7 +36,7 @@
#include "removesharedmemorycommand.h"
#include <QQuickView>
#include <QQuickItem>
#include <designersupport.h>
#include <designersupportdelegate.h>
namespace QmlDesigner {
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
+1 -1
View File
@@ -63,7 +63,7 @@
#include "dummycontextobject.h"
#include <designersupport.h>
#include <designersupportdelegate.h>
namespace QmlDesigner {
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp
+1 -1
View File
@@ -65,7 +65,7 @@
#include "dummycontextobject.h"
#include <designersupport.h>
#include <designersupportdelegate.h>
namespace QmlDesigner {
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
+1 -1
View File
@@ -36,7 +36,7 @@
#include "objectnodeinstance.h"
#include <QQuickItem>
#include <designersupport.h>
#include <designersupportdelegate.h>
namespace QmlDesigner {
namespace Internal {
share/qtcreator/qml/qmlpuppet/qmlprivategate/designersupportdelegate.h
+5
View File
@@ -0,0 +1,5 @@
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
#include <private/qquickdesignersupport_p.h>
#else
#include <designersupport.h>
#endif
share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp
+1 -1
View File
@@ -57,7 +57,7 @@
#include <private/qquickstateoperations_p.h>
#include <designersupport.h>
#include <designersupportdelegate.h>
namespace QmlDesigner {