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

List:       kde-commits
Subject:    [gcompris/sok_A_Jarvis_explore_monuments] src/activities/explore_monuments: Updated QtQuick.Controls
From:       Ayush Agrawal <ayushagrawal288 () gmail ! com>
Date:       2016-01-02 18:10:30
Message-ID: E1aFQdK-0008SJ-4E () scm ! kde ! org
[Download RAW message or body]

Git commit cd06af22a2fcbd54f6b8fcc58b0101d75769e563 by Ayush Agrawal.
Committed on 02/01/2016 at 18:10.
Pushed by ayushagrawal into branch 'sok_A_Jarvis_explore_monuments'.

Updated QtQuick.Controls version and headers

M  +1    -1    src/activities/explore_monuments/ExploreLevels.qml
M  +0    -1    src/activities/explore_monuments/Explore_monuments.qml
M  +1    -1    src/activities/explore_monuments/resource/board/board3.qml
M  +1    -1    src/activities/explore_monuments/resource/board/board4.qml

http://commits.kde.org/gcompris/cd06af22a2fcbd54f6b8fcc58b0101d75769e563

diff --git a/src/activities/explore_monuments/ExploreLevels.qml b/src/activ=
ities/explore_monuments/ExploreLevels.qml
index e04ffa5..cd519d9 100644
--- a/src/activities/explore_monuments/ExploreLevels.qml
+++ b/src/activities/explore_monuments/ExploreLevels.qml
@@ -25,7 +25,7 @@
 import QtQuick 2.1
 import GCompris 1.0
 import QtGraphicalEffects 1.0
-import QtQuick.Controls 1.4
+import QtQuick.Controls 1.2
 =

 import "../../core"
 import "explore-level.js" as Activity
diff --git a/src/activities/explore_monuments/Explore_monuments.qml b/src/a=
ctivities/explore_monuments/Explore_monuments.qml
index 74c2c16..ca5e7aa 100644
--- a/src/activities/explore_monuments/Explore_monuments.qml
+++ b/src/activities/explore_monuments/Explore_monuments.qml
@@ -3,7 +3,6 @@
 * Copyright (C) 2015 Ayush Agrawal <ayushagrawal288@gmail.com>
 *
 * Authors:
-*   Beth Hadley <bethmhadley@gmail.com> (GTK+ version)
 *   Ayush Agrawal <ayushagrawal288@gmail.com> (Qt Quick port)
 *
 *   This program is free software; you can redistribute it and/or modify
diff --git a/src/activities/explore_monuments/resource/board/board3.qml b/s=
rc/activities/explore_monuments/resource/board/board3.qml
index c70016f..9fc6dbd 100644
--- a/src/activities/explore_monuments/resource/board/board3.qml
+++ b/src/activities/explore_monuments/resource/board/board3.qml
@@ -4,7 +4,7 @@
  *
  * Authors:
  *   Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
- *   Ayush Agrawal <ayushagrawal288@gmail.com>
+ *   Ayush Agrawal <ayushagrawal288@gmail.com> (Qt Quick port)
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/src/activities/explore_monuments/resource/board/board4.qml b/s=
rc/activities/explore_monuments/resource/board/board4.qml
index 7d6e82b..0dade44 100644
--- a/src/activities/explore_monuments/resource/board/board4.qml
+++ b/src/activities/explore_monuments/resource/board/board4.qml
@@ -4,7 +4,7 @@
  *
  * Authors:
  *   Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
- *   Ayush Agrawal <ayushagrawal288@gmail.com>
+ *   Ayush Agrawal <ayushagrawal288@gmail.com> (Qt Quick port)
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
[prev in list] [next in list] [prev in thread] [next in thread]