Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/override-and-debug into lp:qtcreator-plugin-ubuntu

[Benjamin Zeller]

- Add some descriptive text when there is no framework detected for a device
- Mark all virtuals that override with the override keyword
- Fix local debugging by passing the directory where the ld loader is located

- Add some descriptive text when there is no framework detected for a device
- Mark all virtuals that override with the override keyword
- Fix local debugging by passing the directory where the ld loader is located

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

FAILED: Continuous integration, rev:466
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/49/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4609/console

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

review: Needs Fixing (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

=== modified file 'share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml'
--- share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml	2015-11-24 11:14:08 +0000
+++ share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml	2016-07-22 10:21:14 +0000
@@ -372,8 +372,11 @@
                                         visible: machineType === DeviceMachineType.Emulator
                                     }
                                     ListItem.SingleValue {
+                                        property string connTxt: machineType == DeviceMachineType.Emulator ?
+                                                                     i18n.tr("Please start the emulator to detect the framework version") :
+                                                                     i18n.tr("Please attach the device to detect the framework version")
                                         text: i18n.tr("Framework version")
-                                        value: frameworkVersion
+                                        value: frameworkVersion.length === 0 ? connTxt : frameworkVersion
                                     }
                                     ListItem.Standard {
                                         //show this listitem only when device is not connected
 
=== modified file 'src/ubuntu/device/container/ubuntulocalrunconfiguration.cpp'
--- src/ubuntu/device/container/ubuntulocalrunconfiguration.cpp	2016-05-31 08:21:29 +0000
+++ src/ubuntu/device/container/ubuntulocalrunconfiguration.cpp	2016-07-22 10:21:14 +0000
@@ -24,6 +24,7 @@
 #include <ubuntu/ubuntucmakecache.h>
 #include <ubuntu/ubuntuprojecthelper.h>
 #include <ubuntu/ubuntuclicktool.h>
+#include <ubuntu/clicktoolchain.h>
 
 #include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtkitinformation.h>
@@ -621,6 +622,21 @@
 QStringList UbuntuLocalRunConfiguration::soLibSearchPaths() const
 {
     QStringList paths;
+
+    //lets tell GDB explicitely WHERE to look for debug syms
+    //otherwise it might try to resolve some symlinks that are broken from the hosts point of view
+    ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(target()->kit());
+    ClickToolChain *uTc = nullptr;
+
+    if (tc && tc->type() == QLatin1String(Constants::UBUNTU_CLICK_TOOLCHAIN_ID))
+        uTc = static_cast<ClickToolChain *>(tc);
+
+    if (uTc) {
+        paths << QString::fromLatin1("%1/lib/%2")
+                 .arg(UbuntuClickTool::targetBasePath(uTc->clickTarget()))
+                 .arg(uTc->gnutriplet());
+    }
+
     CMakeProjectManager::CMakeProject *cmakeProj
             = qobject_cast<CMakeProjectManager::CMakeProject *>(target()->project());
 
 
=== modified file 'src/ubuntu/device/container/ubuntulocalrunconfiguration.h'
--- src/ubuntu/device/container/ubuntulocalrunconfiguration.h	2016-05-23 07:26:49 +0000
+++ src/ubuntu/device/container/ubuntulocalrunconfiguration.h	2016-07-22 10:21:14 +0000
@@ -58,16 +58,14 @@
     bool aboutToStart (QString *errorMessage);
 
     QString appId() const;
+    void addToBaseEnvironment(Utils::Environment &env) const;
 
     // AbstractRemoteLinuxRunConfiguration interface
     virtual QString localExecutableFilePath() const override;
     virtual QString remoteExecutableFilePath() const override;
     virtual QStringList arguments() const override;
     virtual Utils::Environment environment() const override;
-    virtual QString workingDirectory() const;
-
-    // LocalApplicationRunConfiguration interface
-    virtual void addToBaseEnvironment(Utils::Environment &env) const;
+    virtual QString workingDirectory() const override;
 
     // RunConfiguration interface
     virtual bool isConfigured () const override;
 
=== modified file 'src/ubuntu/device/remote/ubuntudevicesignaloperation.h'
--- src/ubuntu/device/remote/ubuntudevicesignaloperation.h	2016-03-29 09:41:07 +0000
+++ src/ubuntu/device/remote/ubuntudevicesignaloperation.h	2016-07-22 10:21:14 +0000
@@ -17,10 +17,10 @@
     typedef QSharedPointer<UbuntuDeviceSignalOperation> Ptr;
 
     // DeviceProcessSignalOperation interface
-    virtual void killProcess(int pid);
-    virtual void killProcess(const QString &filePath);
-    virtual void interruptProcess(int pid);
-    virtual void interruptProcess(const QString &filePath);
+    virtual void killProcess(int pid) override;
+    virtual void killProcess(const QString &filePath) override;
+    virtual void interruptProcess(int pid) override;
+    virtual void interruptProcess(const QString &filePath) override;
 
 private:
     void sendSignal (int pid, int signal);
 
=== modified file 'src/ubuntu/device/remote/ubuntudirectuploadstep.h'
--- src/ubuntu/device/remote/ubuntudirectuploadstep.h	2016-03-29 10:39:39 +0000
+++ src/ubuntu/device/remote/ubuntudirectuploadstep.h	2016-07-22 10:21:14 +0000
@@ -23,7 +23,7 @@
     // BuildStep interface
     virtual void run(QFutureInterface<bool> &fi) override;
 
-    ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
+    ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
     bool initInternal(QString *error = 0) override;
 
     RemoteLinux::AbstractRemoteLinuxDeployService *deployService() const override;
 
=== modified file 'src/ubuntu/ubuntuabstractguieditor.h'
--- src/ubuntu/ubuntuabstractguieditor.h	2015-06-11 14:03:50 +0000
+++ src/ubuntu/ubuntuabstractguieditor.h	2016-07-22 10:21:14 +0000
@@ -36,14 +36,14 @@
 public:
     UbuntuAbstractGuiEditor(const Core::Context &context);
 
-    QWidget *toolBar();
+    QWidget *toolBar() override;
     UbuntuAbstractGuiEditorWidget *editorWidget() const;
-    Core::IDocument *document();
+    Core::IDocument *document() override;
     TextEditor::TextEditorWidget *textEditor() const;
 
-    int currentLine() const;
-    int currentColumn() const;
-    void gotoLine(int line, int column = 0) { textEditor()->gotoLine(line, column); }
+    int currentLine() const override;
+    int currentColumn() const override;
+    void gotoLine(int line, int column = 0, bool centerLine = true) override { textEditor()->gotoLine(line, column, centerLine); }
 
 protected:
     virtual UbuntuAbstractGuiEditorWidget * createGuiEditor () = 0;
 
=== modified file 'src/ubuntu/ubuntuabstractguieditordocument.h'
--- src/ubuntu/ubuntuabstractguieditordocument.h	2015-03-06 15:02:08 +0000
+++ src/ubuntu/ubuntuabstractguieditordocument.h	2016-07-22 10:21:14 +0000
@@ -32,7 +32,7 @@
 {
 public:
     UbuntuAbstractGuiEditorDocument(const QString &mimeType, UbuntuAbstractGuiEditorWidget *editorWidget);
-    bool save(QString *errorString, const QString &fileName = QString(), bool autoSave = false);
+    bool save(QString *errorString, const QString &fileName = QString(), bool autoSave = false) override;
 
     QString defaultPath() const override;
     QString suggestedFileName() const override;
 
=== modified file 'src/ubuntu/ubuntuapparmoreditor.h'
--- src/ubuntu/ubuntuapparmoreditor.h	2015-06-11 14:03:50 +0000
+++ src/ubuntu/ubuntuapparmoreditor.h	2016-07-22 10:21:14 +0000
@@ -61,10 +61,10 @@
 
 protected:
     virtual void updateAfterFileLoad() override;
-    virtual bool syncToWidgets();
+    virtual bool syncToWidgets() override;
     bool syncToWidgets(UbuntuClickManifest *source);
-    virtual void syncToSource();
-    virtual QWidget *createMainWidget();
+    virtual void syncToSource() override;
+    virtual QWidget *createMainWidget() override;
 
 protected slots:
     void on_pushButton_addpolicy_clicked();    
 
=== modified file 'src/ubuntu/ubuntudevicesmodel.h'
--- src/ubuntu/ubuntudevicesmodel.h	2016-03-29 09:41:07 +0000
+++ src/ubuntu/ubuntudevicesmodel.h	2016-07-22 10:21:14 +0000
@@ -93,11 +93,11 @@
     UbuntuDevice::ConstPtr device ( const int index );
 
     // QAbstractItemModel interface
-    virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    virtual bool setData(const QModelIndex &index, const QVariant &value, int role);
-    virtual QVariant data(const QModelIndex &index, int role) const;
-    virtual QHash<int, QByteArray> roleNames() const;
-    virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+    virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    virtual bool setData(const QModelIndex &index, const QVariant &value, int role) override;
+    virtual QVariant data(const QModelIndex &index, int role) const override;
+    virtual QHash<int, QByteArray> roleNames() const override;
+    virtual Qt::ItemFlags flags(const QModelIndex &index) const override;
 
     bool cancellable() const;
     QString state() const;
 
=== modified file 'src/ubuntu/ubuntueditorfactory.h'
--- src/ubuntu/ubuntueditorfactory.h	2014-08-18 12:29:43 +0000
+++ src/ubuntu/ubuntueditorfactory.h	2016-07-22 10:21:14 +0000
@@ -11,7 +11,7 @@
     Q_OBJECT
 public:
     explicit UbuntuManifestEditorFactory();
-    Core::IEditor *createEditor();
+    Core::IEditor *createEditor() override;
 };
 
 class UbuntuApparmorEditorFactory : public Core::IEditorFactory
@@ -19,7 +19,7 @@
     Q_OBJECT
 public:
     explicit UbuntuApparmorEditorFactory();
-    Core::IEditor *createEditor();
+    Core::IEditor *createEditor() override;
 };
 
 } // namespace Internal
 
=== modified file 'src/ubuntu/ubuntufixmanifeststep.h'
--- src/ubuntu/ubuntufixmanifeststep.h	2015-02-13 12:04:38 +0000
+++ src/ubuntu/ubuntufixmanifeststep.h	2016-07-22 10:21:14 +0000
@@ -18,9 +18,9 @@
     void setPackageDir(const QString &packageDir);
 
     // BuildStep interface
-    virtual bool init();
-    virtual void run(QFutureInterface<bool> &fi);
-    virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
+    virtual bool init() override;
+    virtual void run(QFutureInterface<bool> &fi) override;
+    virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
 
 private:
     QString m_packageDir;
 
=== modified file 'src/ubuntu/ubuntumanifesteditor.h'
--- src/ubuntu/ubuntumanifesteditor.h	2014-08-19 06:15:32 +0000
+++ src/ubuntu/ubuntumanifesteditor.h	2016-07-22 10:21:14 +0000
@@ -37,7 +37,7 @@
 
     // UbuntuAbstractGuiEditor interface
 protected:
-    virtual UbuntuAbstractGuiEditorWidget *createGuiEditor();
+    virtual UbuntuAbstractGuiEditorWidget *createGuiEditor() override;
 
 private:
     UbuntuManifestEditorWidget *m_editorWidget;
 
=== modified file 'src/ubuntu/ubuntumanifesteditorwidget.h'
--- src/ubuntu/ubuntumanifesteditorwidget.h	2015-06-11 14:03:50 +0000
+++ src/ubuntu/ubuntumanifesteditorwidget.h	2016-07-22 10:21:14 +0000
@@ -49,10 +49,10 @@
 protected:
     virtual void updateAfterFileLoad() override;
     virtual void aboutToOpen(const QString &fileName, const QString &realFileName) override;
-    bool syncToWidgets ();
+    bool syncToWidgets () override;
     bool syncToWidgets (UbuntuClickManifest *source);
-    void syncToSource  ();
-    QWidget *createMainWidget();
+    void syncToSource  () override;
+    QWidget *createMainWidget() override;
     void addMissingFieldsToManifest(QString fileName);
 
 protected slots:
 
=== modified file 'src/ubuntu/ubuntupackageoutputparser.h'
--- src/ubuntu/ubuntupackageoutputparser.h	2015-07-08 15:43:11 +0000
+++ src/ubuntu/ubuntupackageoutputparser.h	2016-07-22 10:21:14 +0000
@@ -16,9 +16,9 @@
 
 public:
     // IOutputParser interface
-    virtual void stdOutput(const QString &line);
-    virtual void stdError(const QString &line);
-    virtual bool hasFatalErrors() const;
+    virtual void stdOutput(const QString &line) override;
+    virtual void stdError(const QString &line) override;
+    virtual bool hasFatalErrors() const override;
 
     void setTreatAllErrorsAsWarnings ( const bool set );
 
@@ -29,7 +29,7 @@
     void onParsedNewTopLevelItem (ClickRunChecksParser::DataItem* item);
 
 private:
-    virtual void doFlush();
+    virtual void doFlush() override;
     void emitTasks (const ClickRunChecksParser::DataItem *item, int level = 0);
     bool isError (const ClickRunChecksParser::DataItem *item);
     ClickRunChecksParser m_subParser;
@@ -45,9 +45,9 @@
 
     // ITaskHandler interface
 public:
-    virtual bool canHandle(const ProjectExplorer::Task &task) const;
-    virtual void handle(const ProjectExplorer::Task &task);
-    virtual QAction *createAction(QObject *parent) const;
+    virtual bool canHandle(const ProjectExplorer::Task &task) const override;
+    virtual void handle(const ProjectExplorer::Task &task) override;
+    virtual QAction *createAction(QObject *parent) const override;
 
 private:
     QUrl getUrl (const ProjectExplorer::Task &task) const;
 
=== modified file 'src/ubuntu/ubuntuqmlbuildconfiguration.h'
--- src/ubuntu/ubuntuqmlbuildconfiguration.h	2015-04-17 09:21:16 +0000
+++ src/ubuntu/ubuntuqmlbuildconfiguration.h	2016-07-22 10:21:14 +0000
@@ -57,8 +57,8 @@
     UbuntuQmlUpdateTranslationTemplateStep(ProjectExplorer::BuildStepList *bsl, UbuntuQmlUpdateTranslationTemplateStep *bs);
 
     // BuildStep interface
-    virtual bool init();
-    virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
+    virtual bool init() override;
+    virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
 
     QString makeCommand(ProjectExplorer::ToolChain *tc, const Utils::Environment &env) const;
 };
@@ -71,9 +71,9 @@
     UbuntuQmlBuildTranslationStep(ProjectExplorer::BuildStepList *bsl, UbuntuQmlBuildTranslationStep *bs);
 
     // BuildStep interface
-    virtual bool init();
-    virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
-    void run(QFutureInterface<bool> &fi);
+    virtual bool init() override;
+    virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
+    void run(QFutureInterface<bool> &fi) override;
 
 private:
     QString m_translationDir;
 
=== modified file 'src/ubuntu/ubuntuvalidationresultmodel.h'
--- src/ubuntu/ubuntuvalidationresultmodel.h	2015-03-03 17:23:52 +0000
+++ src/ubuntu/ubuntuvalidationresultmodel.h	2016-07-22 10:21:14 +0000
@@ -92,13 +92,13 @@
     ~UbuntuValidationResultModel();
 
     // QAbstractItemModel interface
-    virtual QModelIndex index(int row, int column, const QModelIndex &parent) const;
-    virtual QModelIndex parent(const QModelIndex &child) const;
-    virtual int rowCount(const QModelIndex &parent) const;
-    virtual int columnCount(const QModelIndex &parent) const;
-    virtual QVariant data(const QModelIndex &index, int role) const;
-    virtual Qt::ItemFlags flags(const QModelIndex &index) const;
-    virtual QHash<int, QByteArray> roleNames() const;
+    virtual QModelIndex index(int row, int column, const QModelIndex &parent) const override;
+    virtual QModelIndex parent(const QModelIndex &child) const override;
+    virtual int rowCount(const QModelIndex &parent) const override;
+    virtual int columnCount(const QModelIndex &parent) const override;
+    virtual QVariant data(const QModelIndex &index, int role) const override;
+    virtual Qt::ItemFlags flags(const QModelIndex &index) const override;
+    virtual QHash<int, QByteArray> roleNames() const override;
 
     QModelIndex findFirstErrorItem () const;
 
 
=== modified file 'src/ubuntu/ubuntuwelcomemode.h'
--- src/ubuntu/ubuntuwelcomemode.h	2016-04-19 12:09:54 +0000
+++ src/ubuntu/ubuntuwelcomemode.h	2016-07-22 10:21:14 +0000
@@ -32,11 +32,11 @@
 
 public:
     // IWelcomePage interface
-    virtual QUrl pageLocation() const;
-    virtual QString title() const;
-    virtual int priority() const;
-    virtual void facilitateQml(QQmlEngine *engine);
-    virtual Core::Id id() const;
+    virtual QUrl pageLocation() const override;
+    virtual QString title() const override;
+    virtual int priority() const override;
+    virtual void facilitateQml(QQmlEngine *engine) override;
+    virtual Core::Id id() const override;
 
 public slots:
     void newProject();
 
=== modified file 'src/ubuntu/wizards/ubuntuprojectmigrationwizard.h'
--- src/ubuntu/wizards/ubuntuprojectmigrationwizard.h	2014-12-02 14:20:35 +0000
+++ src/ubuntu/wizards/ubuntuprojectmigrationwizard.h	2016-07-22 10:21:14 +0000
@@ -50,8 +50,8 @@
 
     // QWizardPage interface
 public:
-    virtual void initializePage();
-    virtual bool isComplete() const;
+    virtual void initializePage() override;
+    virtual bool isComplete() const override;
 };
 
 class UbuntuProjectDetailsPage : public QWizardPage
@@ -62,8 +62,8 @@
 
     // QWizardPage interface
 public:
-    virtual void initializePage();
-    virtual bool isComplete() const;
+    virtual void initializePage() override;
+    virtual bool isComplete() const override;
 
 private:
     bool m_initialized;