Merge lp:~zeller-benjamin/ubuntu-sdk-ide/publishcompileinfo into lp:ubuntu-sdk-ide

Proposed by Benjamin Zeller on 2016-09-23
Status: Merged
Approved by: Zoltan Balogh on 2016-09-26
Approved revision: 163
Merged at revision: 163
Proposed branch: lp:~zeller-benjamin/ubuntu-sdk-ide/publishcompileinfo
Merge into: lp:ubuntu-sdk-ide
Diff against target: 85 lines (+28/-1)
2 files modified
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntupackagingmode.cpp (+13/-1)
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntupackagingmodel.cpp (+15/-0)
To merge this branch: bzr merge lp:~zeller-benjamin/ubuntu-sdk-ide/publishcompileinfo
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve on 2016-09-26
Zoltan Balogh (community) 2016-09-23 Approve on 2016-09-26
Review via email: mp+306630@code.launchpad.net

Commit message

Show compile messages on the publish page.

Description of the change

Show compile messages on the publish page.

To post a comment you must log in.
review: Approve (continuous-integration)
Zoltan Balogh (bzoltan) :
review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntupackagingmode.cpp'
2--- dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntupackagingmode.cpp 2016-08-26 14:14:29 +0000
3+++ dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntupackagingmode.cpp 2016-09-23 14:07:40 +0000
4@@ -34,6 +34,8 @@
5 #include <QScrollArea>
6
7 #include <cmakeprojectmanager/cmakeprojectconstants.h>
8+#include <coreplugin/minisplitter.h>
9+#include <coreplugin/outputpane.h>
10
11 #include <QScrollArea>
12 #include <QQuickView>
13@@ -74,7 +76,17 @@
14 container->setMinimumWidth(860);
15 container->setMinimumHeight(548);
16 container->setFocusPolicy(Qt::TabFocus);
17- layout->addWidget(container);
18+
19+ auto mainWindowSplitter = new Core::MiniSplitter;
20+ mainWindowSplitter->addWidget(container);
21+ auto outputPane = new Core::OutputPanePlaceHolder(Ubuntu::Constants::UBUNTU_MODE_PACKAGING, mainWindowSplitter);
22+ mainWindowSplitter->addWidget(outputPane);
23+ mainWindowSplitter->setStretchFactor(0, 10);
24+ mainWindowSplitter->setStretchFactor(1, 0);
25+ mainWindowSplitter->setOrientation(Qt::Vertical);
26+
27+
28+ layout->addWidget(mainWindowSplitter);
29
30 m_modeView->rootContext()->setContextProperty(QLatin1String("publishModel") ,m_viewModel);
31 m_modeView->rootContext()->setContextProperty(QLatin1String("resourceRoot") ,Constants::UBUNTU_DEVICESCREEN_ROOT);
32
33=== modified file 'dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntupackagingmodel.cpp'
34--- dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntupackagingmodel.cpp 2016-09-22 16:11:03 +0000
35+++ dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntupackagingmodel.cpp 2016-09-23 14:07:40 +0000
36@@ -44,6 +44,7 @@
37 #include <projectexplorer/kit.h>
38 #include <projectexplorer/buildsteplist.h>
39 #include <projectexplorer/toolchain.h>
40+#include <extensionsystem/pluginmanager.h>
41 #include <coreplugin/actionmanager/actionmanager.h>
42 #include <coreplugin/actionmanager/actioncontainer.h>
43 #include <cmakeprojectmanager/cmakeprojectconstants.h>
44@@ -69,6 +70,17 @@
45 debug = 0
46 };
47
48+static void showCompileOutputPane ()
49+{
50+ QObject *paneObj = ExtensionSystem::PluginManager::getObjectByClassName(QStringLiteral("ProjectExplorer::Internal::CompileOutputWindow"));
51+ QTC_ASSERT(paneObj != nullptr, return);
52+
53+ Core::IOutputPane *compileWindow = qobject_cast<Core::IOutputPane *>(paneObj);
54+ if (compileWindow) {
55+ compileWindow->showPage(Core::IOutputPane::NoModeSwitch);
56+ }
57+}
58+
59 UbuntuPackagingModel::UbuntuPackagingModel(QObject *parent) :
60 QObject(parent),
61 m_postPackageTask(Verify)
62@@ -540,6 +552,7 @@
63 }
64
65 ProjectExplorer::BuildManager::buildLists(rawSteps,rawStepMessages);
66+ showCompileOutputPane();
67 }
68
69 } else if(isCMake || isHtml || isQml) {
70@@ -586,6 +599,7 @@
71 m_buildManagerConnection = connect(ProjectExplorer::BuildManager::instance(),SIGNAL(buildQueueFinished(bool)),this,SLOT(buildFinished(bool)));
72
73 ProjectExplorer::BuildManager::buildList(m_packageBuildSteps.last().data(),tr("Build Project"));
74+ showCompileOutputPane();
75 }
76 }
77
78@@ -640,6 +654,7 @@
79 m_buildManagerConnection = connect(ProjectExplorer::BuildManager::instance(),SIGNAL(buildQueueFinished(bool)),this,SLOT(buildFinished(bool)));
80
81 ProjectExplorer::BuildManager::buildList(m_packageBuildSteps.last().data(),tr("Build Project"));
82+ showCompileOutputPane();
83 }
84
85 /*!

Subscribers

People subscribed via source and target branches