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

List:       kde-commits
Subject:    [kde-runtime] plasma/declarativeimports: Merge branch 'plasma/terietorANDkokeroulis/KLocaleQMLBindin
From:       Giorgos Tsiapaliwkas <terietor () gmail ! com>
Date:       2012-05-02 9:43:19
Message-ID: 20120502094319.EC5FDA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 569eaec98b649f5b592e8a5a44dd655c62e1f6df by Giorgos Tsiapaliwkas.
Committed on 02/05/2012 at 11:39.
Pushed by tsiapaliwkas into branch 'master'.

Merge branch 'plasma/terietorANDkokeroulis/KLocaleQMLBindings'
Fix the git conflicts
Conflicts:
	plasma/declarativeimports/CMakeLists.txt
	plasma/declarativeimports/test/contents/ui/Gallery.qml

M  +1    -0    plasma/declarativeimports/CMakeLists.txt
M  +0    -0    plasma/declarativeimports/test/contents/ui/Busy.qml
M  +0    -0    plasma/declarativeimports/test/contents/ui/Buttons.qml
M  +0    -0    plasma/declarativeimports/test/contents/ui/CheckableButtons.=
qml
M  +3    -0    plasma/declarativeimports/test/contents/ui/Gallery.qml
M  +0    -0    plasma/declarativeimports/test/contents/ui/Scrollers.qml
M  +0    -0    plasma/declarativeimports/test/contents/ui/Sliders.qml
M  +0    -0    plasma/declarativeimports/test/contents/ui/TextEditing.qml
M  +0    -0    plasma/declarativeimports/test/contents/ui/Texts.qml

http://commits.kde.org/kde-runtime/569eaec98b649f5b592e8a5a44dd655c62e1f6df

diff --cc plasma/declarativeimports/CMakeLists.txt
index d515848,f423be0..71dc282
--- a/plasma/declarativeimports/CMakeLists.txt
+++ b/plasma/declarativeimports/CMakeLists.txt
@@@ -4,4 -4,4 +4,5 @@@ add_subdirectory(graphicslayouts
  add_subdirectory(graphicswidgets)
  add_subdirectory(qtextracomponents)
  add_subdirectory(plasmacomponents)
 +add_subdirectory(plasmaextracomponents)
+ add_subdirectory(locale)
diff --cc plasma/declarativeimports/test/contents/ui/Gallery.qml
index b147ed9,d0aadb1..aecd055
--- a/plasma/declarativeimports/test/contents/ui/Gallery.qml
+++ b/plasma/declarativeimports/test/contents/ui/Gallery.qml
@@@ -76,9 -76,10 +76,12 @@@ PlasmaExtras.App =

                  page: "Misc.qml"
                  title: "Misc stuff"
              }
 -
 +            ListElement {
 +                page: "Extras.qml"
 +                title: "Extras"
+             ListElement {
+                 page: "Locale.qml"
+                 title: "Locale stuff"
              }
          }
          delegate: ListItem {
[prev in list] [next in list] [prev in thread] [next in thread]