diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-01-23 14:42:55 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-01-24 08:39:31 +0000 |
| commit | de8ef0c0662c0e666b1aaa4b324d720fb7358288 (patch) | |
| tree | 26db2ccc04653448ec9bbfde39ce2e708cab93b2 | |
| parent | 527c579237f66d6b6547fb3afd34180e3be9ba63 (diff) | |
| download | qt-creator-de8ef0c0662c0e666b1aaa4b324d720fb7358288.tar.gz | |
Fix ProjectExplorerPlugin::testJsonWizardsIconList()
We returned a pointer to temporary data from a function.
Amends 6796839da3.
Change-Id: I920789b344c93158092ef23e4bb8019cc9c312c9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -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() |