diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-01-31 08:38:13 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-01-31 08:38:13 +0100 |
| commit | 868160f215ea06d4dfbaf089fab03b066a9fef69 (patch) | |
| tree | ded676351febfccb60e25603486bd06d0d89185b /src/plugins/projectexplorer/jsonwizard | |
| parent | 54c2dff181b0900644e973fca1ebb21c862f124f (diff) | |
| parent | ac382b68b7c67af45096cb590fc537b5794e8f27 (diff) | |
Merge remote-tracking branch 'origin/4.8'
Change-Id: Ia8fed69168d87afafdb5acf4de4d5d30f9b4ebf5
Diffstat (limited to 'src/plugins/projectexplorer/jsonwizard')
| -rw-r--r-- | src/plugins/projectexplorer/jsonwizard/jsonwizard_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard_test.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizard_test.cpp index 890291f701..9a5947cdd1 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizard_test.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizard_test.cpp @@ -248,10 +248,10 @@ void ProjectExplorer::ProjectExplorerPlugin::testJsonWizardsComboBox() QCOMPARE(qPrintable(disabledComboBox->currentText()), "fgh"); } -static const char *iconInsideResource(const QString &relativePathToIcon) +static QString iconInsideResource(const QString &relativePathToIcon) { const QDir resourcePath(Core::ICore::resourcePath()); - return resourcePath.filePath(relativePathToIcon).toLocal8Bit().data(); + return resourcePath.filePath(relativePathToIcon); } void ProjectExplorer::ProjectExplorerPlugin::testJsonWizardsIconList() |