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

[Benjamin Zeller]

Show compile messages on the publish page.

Show compile messages on the publish page.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:163
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/349/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6809/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/349/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:163
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/350/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6827/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/350/rebuild

review: Approve (continuous-integration)

=== modified file 'dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntupackagingmode.cpp'
--- dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntupackagingmode.cpp	2016-08-26 14:14:29 +0000
+++ dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntupackagingmode.cpp	2016-09-23 14:07:40 +0000
@@ -34,6 +34,8 @@
 #include <QScrollArea>
 
 #include <cmakeprojectmanager/cmakeprojectconstants.h>
+#include <coreplugin/minisplitter.h>
+#include <coreplugin/outputpane.h>
 
 #include <QScrollArea>
 #include <QQuickView>
@@ -74,7 +76,17 @@
     container->setMinimumWidth(860);
     container->setMinimumHeight(548);
     container->setFocusPolicy(Qt::TabFocus);
-    layout->addWidget(container);
+
+    auto mainWindowSplitter = new Core::MiniSplitter;
+    mainWindowSplitter->addWidget(container);
+    auto outputPane = new Core::OutputPanePlaceHolder(Ubuntu::Constants::UBUNTU_MODE_PACKAGING, mainWindowSplitter);
+    mainWindowSplitter->addWidget(outputPane);
+    mainWindowSplitter->setStretchFactor(0, 10);
+    mainWindowSplitter->setStretchFactor(1, 0);
+    mainWindowSplitter->setOrientation(Qt::Vertical);
+
+
+    layout->addWidget(mainWindowSplitter);
 
     m_modeView->rootContext()->setContextProperty(QLatin1String("publishModel") ,m_viewModel);
     m_modeView->rootContext()->setContextProperty(QLatin1String("resourceRoot") ,Constants::UBUNTU_DEVICESCREEN_ROOT);

=== modified file 'dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntupackagingmodel.cpp'
--- dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntupackagingmodel.cpp	2016-09-22 16:11:03 +0000
+++ dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntupackagingmodel.cpp	2016-09-23 14:07:40 +0000
@@ -44,6 +44,7 @@
 #include <projectexplorer/kit.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/toolchain.h>
+#include <extensionsystem/pluginmanager.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <cmakeprojectmanager/cmakeprojectconstants.h>
@@ -69,6 +70,17 @@
     debug = 0
 };
 
+static void showCompileOutputPane ()
+{
+    QObject *paneObj = ExtensionSystem::PluginManager::getObjectByClassName(QStringLiteral("ProjectExplorer::Internal::CompileOutputWindow"));
+    QTC_ASSERT(paneObj != nullptr, return);
+
+    Core::IOutputPane *compileWindow = qobject_cast<Core::IOutputPane *>(paneObj);
+    if (compileWindow) {
+        compileWindow->showPage(Core::IOutputPane::NoModeSwitch);
+    }
+}
+
 UbuntuPackagingModel::UbuntuPackagingModel(QObject *parent) :
     QObject(parent),
     m_postPackageTask(Verify)
@@ -540,6 +552,7 @@
             }
 
             ProjectExplorer::BuildManager::buildLists(rawSteps,rawStepMessages);
+            showCompileOutputPane();
         }
 
     } else if(isCMake || isHtml || isQml) {
@@ -586,6 +599,7 @@
         m_buildManagerConnection = connect(ProjectExplorer::BuildManager::instance(),SIGNAL(buildQueueFinished(bool)),this,SLOT(buildFinished(bool)));
 
         ProjectExplorer::BuildManager::buildList(m_packageBuildSteps.last().data(),tr("Build Project"));
+        showCompileOutputPane();
     }
 }
 
@@ -640,6 +654,7 @@
     m_buildManagerConnection = connect(ProjectExplorer::BuildManager::instance(),SIGNAL(buildQueueFinished(bool)),this,SLOT(buildFinished(bool)));
 
     ProjectExplorer::BuildManager::buildList(m_packageBuildSteps.last().data(),tr("Build Project"));
+    showCompileOutputPane();
 }
 
 /*!