feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Fix test

Browse Source 
Change-Id: Iac8e6a74543f5ad19f91dc42c0fc666890f114fc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Christian Stenger
2018-10-23 13:32:39 +02:00
parent 85fcd67538
commit 6796839da3
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/projectexplorer/jsonwizard/jsonwizard_test.cpp
View File

@@ -25,6 +25,8 @@
#include "jsonwizardfactory.h" #include "jsonwizardfactory.h"
#include <coreplugin/icore.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <QJsonDocument> #include <QJsonDocument>
@@ -246,6 +248,12 @@ void ProjectExplorer::ProjectExplorerPlugin::testJsonWizardsComboBox()
QCOMPARE(qPrintable(disabledComboBox->currentText()), "fgh"); QCOMPARE(qPrintable(disabledComboBox->currentText()), "fgh");
} }
static const char *iconInsideResource(const QString &relativePathToIcon)
{
const QDir resourcePath(Core::ICore::resourcePath());
return resourcePath.filePath(relativePathToIcon).toLocal8Bit().data();
}
void ProjectExplorer::ProjectExplorerPlugin::testJsonWizardsIconList() void ProjectExplorer::ProjectExplorerPlugin::testJsonWizardsIconList()
{ {
QString errorMessage; QString errorMessage;
@@ -255,8 +263,7 @@ void ProjectExplorer::ProjectExplorerPlugin::testJsonWizardsIconList()
QJsonObject{ QJsonObject{
{"trKey", "item no1"}, {"trKey", "item no1"},
{"condition", true}, {"condition", true},
{"icon", "../share/qtcreator/templates/wizards/qtquickstyleicons/default.png"} {"icon", iconInsideResource("templates/wizards/qtquickstyleicons/default.png")}
}, },
QJsonObject{ QJsonObject{
{"trKey", "item no2"}, {"trKey", "item no2"},
@@ -268,7 +275,7 @@ void ProjectExplorer::ProjectExplorerPlugin::testJsonWizardsIconList()
{"trKey", "item no3"}, {"trKey", "item no3"},
{"condition", true}, {"condition", true},
{"trToolTip", "MyToolTip"}, {"trToolTip", "MyToolTip"},
{"icon", "../share/qtcreator/templates/wizards/qtquickstyleicons/default.png"} {"icon", iconInsideResource("templates/wizards/qtquickstyleicons/default.png")}
} }
}); });