Merge remote-tracking branch 'origin/welcomeq'

src/modules/welcome/Config.cpp

@@ -191,12 +191,6 @@ Config::setIsNextEnabled( bool isNextEnabled )
     emit isNextEnabledChanged( m_isNextEnabled );
 }
 
-QString
-Config::donateUrl() const
-{
-    return m_donateUrl;
-}
-
 void
 Config::setDonateUrl( const QString& url )
 {
@@ -204,12 +198,6 @@ Config::setDonateUrl( const QString& url )
     emit donateUrlChanged();
 }
 
-QString
-Config::knownIssuesUrl() const
-{
-    return m_knownIssuesUrl;
-}
-
 void
 Config::setKnownIssuesUrl( const QString& url )
 {
@@ -224,18 +212,6 @@ Config::setReleaseNotesUrl( const QString& url )
     emit releaseNotesUrlChanged();
 }
 
-QString
-Config::releaseNotesUrl() const
-{
-    return m_releaseNotesUrl;
-}
-
-QString
-Config::supportUrl() const
-{
-    return m_supportUrl;
-}
-
 void
 Config::setSupportUrl( const QString& url )
 {

src/modules/welcome/Config.h

@@ -59,19 +59,19 @@ public:
 
     void setIsNextEnabled( bool isNextEnabled );
 
-    void setLocaleIndex( int index );
     int localeIndex() const { return m_localeIndex; }
+    void setLocaleIndex( int index );
 
-    QString supportUrl() const;
+    QString supportUrl() const { return m_supportUrl; }
     void setSupportUrl( const QString& url );
 
-    QString knownIssuesUrl() const;
+    QString knownIssuesUrl() const { return m_knownIssuesUrl; }
     void setKnownIssuesUrl( const QString& url );
 
-    QString releaseNotesUrl() const;
+    QString releaseNotesUrl() const { return m_releaseNotesUrl; }
     void setReleaseNotesUrl( const QString& url );
 
-    QString donateUrl() const;
+    QString donateUrl() const { return m_donateUrl; }
     void setDonateUrl( const QString& url );
 
     QString genericWelcomeMessage() const;

src/modules/welcomeq/welcomeq.qml

@@ -152,9 +152,9 @@ Page
                     anchors.left: image.right
                     width: languageBar.width /1.1
                     textRole: "label"
-                    currentIndex: 4 //model.currentIndex
+                    currentIndex: config.localeIndex
                     model: config.languagesModel
-                    onCurrentIndexChanged: console.debug(currentText, currentIndex)
+                    onCurrentIndexChanged: config.localeIndex = currentIndex
                 }
             }
         }