ubports-cn/ubuntu-sdk-ide_orig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trusty build fixes

Browse Source
This commit is contained in:
Benjamin Zeller
2016-09-06 12:38:53 +02:00
parent 08313e2020
commit 4db6d99822
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
debian/patches/cmake_ubuntuspecificbits.diff vendored
View File

@@ -184,3 +184,14 @@
signals:
/// emitted when cmake is running:
void parsingStarted();
--- a/dist/qt-everywhere-opensource-src-5.6.0/ubuntu-sdk/src/Ubuntu/UbuntuToolkit/menu.cpp
+++ b/dist/qt-everywhere-opensource-src-5.6.0/ubuntu-sdk/src/Ubuntu/UbuntuToolkit/menu.cpp
@@ -350,8 +350,6 @@
: UCAction(parent)
, d_ptr(new MenuPrivate(this))
{
- Q_D(Menu);
-
connect(this, SIGNAL(enabledChanged()), this, SLOT(_q_updateEnabled()));
connect(this, SIGNAL(textChanged()), this, SLOT(_q_updateText()));
connect(this, SIGNAL(iconNameChanged()), this, SLOT(_q_updateIcon()));

2
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/device/remote/ubunturemoteanalyzesupport.cpp vendored
View File

@@ -47,7 +47,7 @@ UbuntuRemoteAnalyzeSupport::UbuntuRemoteAnalyzeSupport(UbuntuRemoteRunConfigurat
d(new UbuntuRemoteAnalyzeSupportPrivate(engine, runMode))
{
d->clickPackage = runConfig->clickPackage();
connect(d->runControl, &Debugger::AnalyzerRunControl::starting,
connect(d->runControl.data(), &Debugger::AnalyzerRunControl::starting,
this, &UbuntuRemoteAnalyzeSupport::handleRemoteSetupRequested);
connect(&d->outputParser, SIGNAL(waitingForConnectionOnPort(Utils::Port)),
SLOT(remoteIsRunning()));

4
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/device/remote/ubunturemotedebugsupport.cpp vendored
View File

@@ -79,8 +79,8 @@ UbuntuRemoteDebugSupport::UbuntuRemoteDebugSupport(UbuntuRemoteRunConfiguration*
: AbstractRemoteRunSupport(runConfig,runControl),
d(new UbuntuRemoteDebugSupportPrivate(runConfig, runControl))
{
connect(d->runControl, SIGNAL(requestRemoteSetup()), this, SLOT(handleRemoteSetupRequested()));
connect(d->runControl,&Debugger::DebuggerRunControl::finished,
connect(d->runControl.data(), SIGNAL(requestRemoteSetup()), this, SLOT(handleRemoteSetupRequested()));
connect(d->runControl.data(),&Debugger::DebuggerRunControl::finished,
this, &UbuntuRemoteDebugSupport::handleDebuggingFinished);
}