1
--- a/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
2
+++ b/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
1
Index: ubuntu-sdk-ide/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
2
===================================================================
3
--- ubuntu-sdk-ide.orig/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
4
+++ ubuntu-sdk-ide/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
5
@@ -165,10 +165,10 @@ void CMakeManager::createXmlFile(Utils::
4
6
proc->setWorkingDirectory(buildDirectoryPath);
5
7
proc->setEnvironment(env);
14
16
Utils::QtcProcess::addArgs(&args, arguments);
16
18
proc->setCommand(executable, args);
17
--- a/dist/qtcreator/src/plugins/qmlprojectmanager/qmlproject.cpp
18
+++ b/dist/qtcreator/src/plugins/qmlprojectmanager/qmlproject.cpp
19
Index: ubuntu-sdk-ide/dist/qtcreator/src/plugins/qmlprojectmanager/qmlproject.cpp
20
===================================================================
21
--- ubuntu-sdk-ide.orig/dist/qtcreator/src/plugins/qmlprojectmanager/qmlproject.cpp
22
+++ ubuntu-sdk-ide/dist/qtcreator/src/plugins/qmlprojectmanager/qmlproject.cpp
23
@@ -288,9 +288,10 @@ Internal::Manager *QmlProject::projectMa
20
24
bool QmlProject::supportsKit(Kit *k, QString *errorMessage) const
22
26
Id deviceType = DeviceTypeKitInformation::deviceTypeId(k);
32
--- a/dist/qtcreator/src/plugins/qmakeprojectmanager/qmakenodes.cpp
33
+++ b/dist/qtcreator/src/plugins/qmakeprojectmanager/qmakenodes.cpp
36
Index: ubuntu-sdk-ide/dist/qtcreator/src/plugins/qmakeprojectmanager/qmakenodes.cpp
37
===================================================================
38
--- ubuntu-sdk-ide.orig/dist/qtcreator/src/plugins/qmakeprojectmanager/qmakenodes.cpp
39
+++ ubuntu-sdk-ide/dist/qtcreator/src/plugins/qmakeprojectmanager/qmakenodes.cpp
40
@@ -2024,6 +2024,7 @@ EvalResult *QmakeProFileNode::evaluate(c
35
41
result->newVarValues[AndroidExtraLibs] = input.readerExact->values(QLatin1String("ANDROID_EXTRA_LIBS"));
36
42
result->newVarValues[IsoIconsVar] = input.readerExact->values(QLatin1String("ISO_ICONS"));
37
43
result->newVarValues[QmakeProjectName] = input.readerExact->values(QLatin1String("QMAKE_PROJECT_NAME"));
40
46
result->isDeployable = false;
41
47
if (result->projectType == ApplicationTemplate) {
42
--- a/dist/qtcreator/src/plugins/qmakeprojectmanager/qmakenodes.h
43
+++ b/dist/qtcreator/src/plugins/qmakeprojectmanager/qmakenodes.h
48
Index: ubuntu-sdk-ide/dist/qtcreator/src/plugins/qmakeprojectmanager/qmakenodes.h
49
===================================================================
50
--- ubuntu-sdk-ide.orig/dist/qtcreator/src/plugins/qmakeprojectmanager/qmakenodes.h
51
+++ ubuntu-sdk-ide/dist/qtcreator/src/plugins/qmakeprojectmanager/qmakenodes.h
52
@@ -107,7 +107,8 @@ enum QmakeVariable {
45
53
AndroidPackageSourceDir,
53
61
namespace Internal {
54
--- a/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeconfigitem.h
55
+++ b/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeconfigitem.h
62
Index: ubuntu-sdk-ide/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeconfigitem.h
63
===================================================================
64
--- ubuntu-sdk-ide.orig/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeconfigitem.h
65
+++ ubuntu-sdk-ide/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeconfigitem.h
72
82
enum Type { FILEPATH, PATH, BOOL, STRING, INTERNAL, STATIC };
74
--- a/dist/qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
75
+++ b/dist/qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
84
Index: ubuntu-sdk-ide/dist/qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
85
===================================================================
86
--- ubuntu-sdk-ide.orig/dist/qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
87
+++ ubuntu-sdk-ide/dist/qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
88
@@ -568,6 +568,11 @@ bool QtVersionManager::isValidId(int id)
77
89
return m_versions.contains(id);
85
97
BaseQtVersion *QtVersionManager::version(int id)
87
99
QTC_ASSERT(isLoaded(), return 0);
88
--- a/dist/qtcreator/src/plugins/qtsupport/qtversionmanager.h
89
+++ b/dist/qtcreator/src/plugins/qtsupport/qtversionmanager.h
100
Index: ubuntu-sdk-ide/dist/qtcreator/src/plugins/qtsupport/qtversionmanager.h
101
===================================================================
102
--- ubuntu-sdk-ide.orig/dist/qtcreator/src/plugins/qtsupport/qtversionmanager.h
103
+++ ubuntu-sdk-ide/dist/qtcreator/src/plugins/qtsupport/qtversionmanager.h
104
@@ -63,6 +63,7 @@ public:
91
105
static void removeVersion(BaseQtVersion *version);
93
107
static bool isValidId(int id);
97
111
// content of BaseQtVersion objects with qmake path might have changed
98
--- a/dist/qtcreator/src/plugins/plugins.pro
99
+++ b/dist/qtcreator/src/plugins/plugins.pro
112
Index: ubuntu-sdk-ide/dist/qtcreator/src/plugins/plugins.pro
113
===================================================================
114
--- ubuntu-sdk-ide.orig/dist/qtcreator/src/plugins/plugins.pro
115
+++ ubuntu-sdk-ide/dist/qtcreator/src/plugins/plugins.pro
116
@@ -56,7 +56,8 @@ SUBDIRS = \
108
124
DO_NOT_BUILD_QMLDESIGNER = $$(DO_NOT_BUILD_QMLDESIGNER)
109
125
isEmpty(DO_NOT_BUILD_QMLDESIGNER) {
110
--- a/dist/qt5/ubuntu-sdk/ubuntu-sdk.pro
111
+++ b/dist/qt5/ubuntu-sdk/ubuntu-sdk.pro
126
Index: ubuntu-sdk-ide/dist/qt5/ubuntu-sdk/ubuntu-sdk.pro
127
===================================================================
128
--- ubuntu-sdk-ide.orig/dist/qt5/ubuntu-sdk/ubuntu-sdk.pro
129
+++ ubuntu-sdk-ide/dist/qt5/ubuntu-sdk/ubuntu-sdk.pro
130
@@ -11,10 +11,10 @@ load(qt_parts)
113
131
src_uitk_launcher.subdir = ubuntu-ui-toolkit-launcher
114
132
src_uitk_launcher.depends = sub-src
124
142
# additional 'make test' target required by continuous integration system
125
143
test.target = test
126
--- a/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeproject.cpp
127
+++ b/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeproject.cpp
144
Index: ubuntu-sdk-ide/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeproject.cpp
145
===================================================================
146
--- ubuntu-sdk-ide.orig/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeproject.cpp
147
+++ ubuntu-sdk-ide/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeproject.cpp
148
@@ -387,6 +387,18 @@ void CMakeProject::runCMake()
144
164
QList<CMakeBuildTarget> CMakeProject::buildTargets() const
146
166
BuildDirManager *bdm = nullptr;
147
--- a/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeproject.h
148
+++ b/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeproject.h
167
Index: ubuntu-sdk-ide/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeproject.h
168
===================================================================
169
--- ubuntu-sdk-ide.orig/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeproject.h
170
+++ ubuntu-sdk-ide/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeproject.h
149
171
@@ -27,6 +27,7 @@
151
173
#include "cmake_global.h"
164
186
/// emitted when cmake is running:
165
187
void parsingStarted();
188
Index: ubuntu-sdk-ide/dist/qt5/ubuntu-sdk/src/UbuntuToolkit/menubar.cpp
189
===================================================================
190
--- ubuntu-sdk-ide.orig/dist/qt5/ubuntu-sdk/src/UbuntuToolkit/menubar.cpp
191
+++ ubuntu-sdk-ide/dist/qt5/ubuntu-sdk/src/UbuntuToolkit/menubar.cpp
192
@@ -249,11 +249,11 @@ PlatformMenuWrapper::PlatformMenuWrapper
196
- connect(m_target, &Menu::visibleChanged, this, &PlatformMenuWrapper::updateVisible);
197
- connect(m_target, &Menu::textChanged, this, &PlatformMenuWrapper::updateText);
198
- connect(m_target, &Menu::enabledChanged, this, &PlatformMenuWrapper::updateEnabled);
199
- connect(m_target, &Menu::iconSourceChanged, this, &PlatformMenuWrapper::updateIcon);
200
- connect(m_target, &Menu::iconNameChanged, this, &PlatformMenuWrapper::updateIcon);
201
+ connect(m_target.data(), &Menu::visibleChanged, this, &PlatformMenuWrapper::updateVisible);
202
+ connect(m_target.data(), &Menu::textChanged, this, &PlatformMenuWrapper::updateText);
203
+ connect(m_target.data(), &Menu::enabledChanged, this, &PlatformMenuWrapper::updateEnabled);
204
+ connect(m_target.data(), &Menu::iconSourceChanged, this, &PlatformMenuWrapper::updateIcon);
205
+ connect(m_target.data(), &Menu::iconNameChanged, this, &PlatformMenuWrapper::updateIcon);