[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/frameworks] tier1/kconfig/autotests/kconfig_compiler: Make test12 pass in frameworks
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2013-11-13 21:54:07
Message-ID: E1VgiNz-0003LG-Cs () scm ! kde ! org
[Download RAW message or body]

Git commit 849b04962ab38d9ab811ef578cd7e2728c4c23d9 by Albert Astals Cid.
Committed on 13/11/2013 at 21:53.
Pushed by aacid into branch 'frameworks'.

Make test12 pass in frameworks

M  +1    -1    tier1/kconfig/autotests/kconfig_compiler/test12.cpp.ref
M  +3    -3    tier1/kconfig/autotests/kconfig_compiler/test12.h.ref

http://commits.kde.org/kdelibs/849b04962ab38d9ab811ef578cd7e2728c4c23d9

diff --git a/tier1/kconfig/autotests/kconfig_compiler/test12.cpp.ref \
b/tier1/kconfig/autotests/kconfig_compiler/test12.cpp.ref index 8a34dbf..69d5bba 100644
--- a/tier1/kconfig/autotests/kconfig_compiler/test12.cpp.ref
+++ b/tier1/kconfig/autotests/kconfig_compiler/test12.cpp.ref
@@ -9,7 +9,7 @@ Test12::Test12(  )
   setCurrentGroup( QLatin1String( "muon" ) );
 
   QList<QUrl> defaultRnRSource;
-  defaultRnRSource.append( QUrl(QString::fromUtf8( "http://kde.org" ) ) );
+  defaultRnRSource.append( QUrl::fromUserInput(QString::fromUtf8( "http://kde.org" ) ) );
 
   KConfigSkeleton::ItemUrlList  *itemRnRSource;
   itemRnRSource = new KConfigSkeleton::ItemUrlList( currentGroup(), QLatin1String( "RnRSource" ), \
                mRnRSource, defaultRnRSource );
diff --git a/tier1/kconfig/autotests/kconfig_compiler/test12.h.ref \
b/tier1/kconfig/autotests/kconfig_compiler/test12.h.ref index 74f7ead..d55414e 100644
--- a/tier1/kconfig/autotests/kconfig_compiler/test12.h.ref
+++ b/tier1/kconfig/autotests/kconfig_compiler/test12.h.ref
@@ -3,7 +3,7 @@
 #ifndef TEST12_H
 #define TEST12_H
 
-#include <kglobal.h>
+#include <qglobal.h>
 #include <kconfigskeleton.h>
 #include <QCoreApplication>
 #include <QDebug>
@@ -19,7 +19,7 @@ class Test12 : public KConfigSkeleton
     /**
       Get RnRSource
     */
-    KUrl::List rnRSource() const
+    QList<QUrl> rnRSource() const
     {
       return mRnRSource;
     }
@@ -27,7 +27,7 @@ class Test12 : public KConfigSkeleton
   protected:
 
     // muon
-    KUrl::List mRnRSource;
+    QList<QUrl> mRnRSource;
 
   private:
 };


[prev in list] [next in list] [prev in thread] [next in thread]