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

- Add some descriptive text when there is no framework detected for a device

Browse Source 
- Mark all virtuals that override with the override keyword
- Fix local debugging by passing the directory where the ld loader is located
This commit is contained in:
Benjamin Zeller
2016-07-22 12:30:50 +02:00
parent 8a9e49216e
commit eaac22563f
18 changed files with 78 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dist/qtcreator/src/plugins/ubuntu/share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml vendored
View File

@@ -372,8 +372,11 @@ Item {
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

16
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/device/container/ubuntulocalrunconfiguration.cpp vendored
View File

@@ -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 @@ bool UbuntuLocalRunConfiguration::isConfigured() const
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());

6
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/device/container/ubuntulocalrunconfiguration.h vendored
View File

@@ -58,16 +58,14 @@ public:
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;

8
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/device/remote/ubuntudevicesignaloperation.h vendored
View File

@@ -17,10 +17,10 @@ public:
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);

2
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/device/remote/ubuntudirectuploadstep.h vendored
View File

@@ -23,7 +23,7 @@ public:
// 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;

10
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuabstractguieditor.h vendored
View File

@@ -36,14 +36,14 @@ class UbuntuAbstractGuiEditor : public Core::IEditor
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;

2
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuabstractguieditordocument.h vendored
View File

@@ -32,7 +32,7 @@ class UbuntuAbstractGuiEditorDocument : public TextEditor::TextDocument
{
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;

6
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuapparmoreditor.h vendored
View File

@@ -61,10 +61,10 @@ public:
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();

10
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntudevicesmodel.h vendored
View File

@@ -93,11 +93,11 @@ public:
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;

4
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntueditorfactory.h vendored
View File

@@ -11,7 +11,7 @@ class UbuntuManifestEditorFactory : public Core::IEditorFactory
Q_OBJECT
public:
explicit UbuntuManifestEditorFactory();
Core::IEditor *createEditor();
Core::IEditor *createEditor() override;
};
class UbuntuApparmorEditorFactory : public Core::IEditorFactory
@@ -19,7 +19,7 @@ class UbuntuApparmorEditorFactory : public Core::IEditorFactory
Q_OBJECT
public:
explicit UbuntuApparmorEditorFactory();
Core::IEditor *createEditor();
Core::IEditor *createEditor() override;
};
} // namespace Internal

6
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntufixmanifeststep.h vendored
View File

@@ -18,9 +18,9 @@ public:
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;

2
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntumanifesteditor.h vendored
View File

@@ -37,7 +37,7 @@ public:
// UbuntuAbstractGuiEditor interface
protected:
virtual UbuntuAbstractGuiEditorWidget *createGuiEditor();
virtual UbuntuAbstractGuiEditorWidget *createGuiEditor() override;
private:
UbuntuManifestEditorWidget *m_editorWidget;

6
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntumanifesteditorwidget.h vendored
View File

@@ -49,10 +49,10 @@ public:
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:

14
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntupackageoutputparser.h vendored
View File

@@ -16,9 +16,9 @@ public:
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 @@ private slots:
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 @@ class UbuntuClickReviewTaskHandler : public ProjectExplorer::ITaskHandler
// 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;

10
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuqmlbuildconfiguration.h vendored
View File

@@ -57,8 +57,8 @@ public:
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 @@ public:
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;

14
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuvalidationresultmodel.h vendored
View File

@@ -92,13 +92,13 @@ public:
~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;

10
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuwelcomemode.h vendored
View File

@@ -32,11 +32,11 @@ class UbuntuWelcomePage : public Core::IWelcomePage
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();

8
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/wizards/ubuntuprojectmigrationwizard.h vendored
View File

@@ -50,8 +50,8 @@ public:
// 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 @@ public:
// QWizardPage interface
public:
virtual void initializePage();
virtual bool isComplete() const;
virtual void initializePage() override;
virtual bool isComplete() const override;
private:
bool m_initialized;