From ce6d54ad9581bbb07b6818e0fb409fc57e6404fd Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 10 Jan 2020 17:45:09 +0100
Subject: [PATCH] [libcalamaresui] Improve failure message, unbreak loading

 - example loading had an X inserted in filename (to test failure)
 - add a space between name and failure
---
 src/libcalamaresui/viewpages/QmlViewStep.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libcalamaresui/viewpages/QmlViewStep.cpp b/src/libcalamaresui/viewpages/QmlViewStep.cpp
index 779a624c1..569eb6cd9 100644
--- a/src/libcalamaresui/viewpages/QmlViewStep.cpp
+++ b/src/libcalamaresui/viewpages/QmlViewStep.cpp
@@ -194,7 +194,7 @@ Calamares::QmlViewStep::setConfigurationMap( const QVariantMap& configurationMap
     if ( !m_qmlComponent )
     {
         // TODO: search for suitable file
-        QString qrcName = QStringLiteral( "qrc:/X%1.qml" ).arg( m_name );
+        QString qrcName = QStringLiteral( "qrc:/%1.qml" ).arg( m_name );
         m_qmlFileName = qrcName;
 
         cDebug() << "QmlViewStep" << moduleInstanceKey() << "loading" << m_qmlFileName;
@@ -216,5 +216,5 @@ void
 Calamares::QmlViewStep::showFailedQml()
 {
     cWarning() << "QmlViewStep" << moduleInstanceKey() << "loading failed.";
-    m_spinner->setText( prettyName() + tr( "Loading failed." ) );
+    m_spinner->setText( prettyName() + ' ' + tr( "Loading failed." ) );
 }