Commit 6c203a3a authored by Johnny Jazeix's avatar Johnny Jazeix
Browse files

build, set minimal version of Qt to 5.6.0

parent 5708be82
if(SAILFISHOS)
cmake_minimum_required(VERSION 2.8.11)
else(SAILfISHOS)
cmake_minimum_required(VERSION 2.8.12)
endif()
cmake_minimum_required(VERSION 2.8.12)
project(gcompris-qt C CXX)
......@@ -96,12 +92,7 @@ if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
directory and create a build directory and call \"${CMAKE_COMMAND} <path to the sources>\".")
endif("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
# Sailfish does not provide a recent Qt version
if(SAILFISHOS)
set(QT_REQUIRED_VERSION 5.2.2)
else()
set(QT_REQUIRED_VERSION 5.3.0)
endif()
set(QT_REQUIRED_VERSION 5.6.0)
find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED
Qml Quick Gui Multimedia Core Svg Xml XmlPatterns LinguistTools Sensors)
......
......@@ -19,7 +19,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import GCompris 1.0
import "../colors"
......
......@@ -16,7 +16,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import GCompris 1.0
import "../../core"
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import "../../core"
import "../algebra_by"
......
......@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import QtGraphicalEffects 1.0
import "../../core"
......
......@@ -17,7 +17,7 @@
*/
.pragma library
.import QtQuick 2.0 as Quick
.import QtQuick 2.6 as Quick
.import "qrc:/gcompris/src/core/core.js" as Core
var currentLevel
......
......@@ -18,7 +18,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import "../../core"
import "../algebra_by/"
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import "../../core"
import "../algebra_by/"
......
......@@ -18,7 +18,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import "../../core"
import "../algebra_by/"
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.2
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "algorithm.js" as Activity
......
......@@ -20,7 +20,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
.pragma library
.import QtQuick 2.0 as Quick
.import QtQuick 2.6 as Quick
.import "qrc:/gcompris/src/core/core.js" as Core
/*
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import "../../core"
import "align4.js" as Activity
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
import "align4.js" as Activity
import GCompris 1.0
......
......@@ -20,7 +20,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
.pragma library
.import QtQuick 2.0 as Quick
.import QtQuick 2.6 as Quick
var currentLevel
var numberOfLevel
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import "../../core"
import "../align4-2players"
......
......@@ -18,7 +18,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
import "../planegame"
Planegame {
......
......@@ -19,9 +19,9 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import GCompris 1.0
import QtQuick.Controls 1.0
import QtQuick.Controls 1.5
import "../../core"
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import GCompris 1.0
import "../../core"
......
......@@ -18,7 +18,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import QtGraphicalEffects 1.0
import GCompris 1.0
import "babymatch.js" as Activity
......
......@@ -18,7 +18,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import GCompris 1.0
import "babymatch.js" as Activity
......
......@@ -18,7 +18,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "babymatch.js" as Activity
......
......@@ -18,7 +18,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import GCompris 1.0
import "../../core"
......
......@@ -20,7 +20,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
.pragma library
.import QtQuick 2.0 as Quick
.import QtQuick 2.6 as Quick
.import GCompris 1.0 as GCompris //for ApplicationInfo
var currentLevel = 1
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
QtObject {
property string instruction: qsTr("Drag and Drop the items to make them match")
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
QtObject {
property variant levels: [
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
QtObject {
property variant levels: [
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
QtObject {
property variant levels: [
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
QtObject {
property variant levels: [
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
QtObject {
property variant levels: [
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
QtObject {
property variant levels: [
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import "../babymatch"
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
QtObject {
property string instruction: qsTr("Drag and Drop the items to make them match")
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
QtObject {
property variant levels: [
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
QtObject {
property variant levels: [
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
QtObject {
property variant levels: [
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
QtObject {
property string instruction: qsTr("Hello ! My name is Lock.")
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
QtObject {
property string instruction: qsTr("Lock with colored shapes.")
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
QtObject {
property int numberOfSubLevel: 4
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
QtObject {
property string instruction: qsTr("Pieter Bruegel the Elder, The peasants wedding - 1568")
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
QtObject {
property string instruction: qsTr("The Lady and the Unicorn - XVe century")
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
QtObject {
property string instruction: qsTr("Vincent van Gogh, Bedroom in Arles - 1888")
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
QtObject {
property string instruction: qsTr("Ambrosius Bosschaert the Elder, Flower Still Life - 1614")
......
......@@ -18,7 +18,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
import Box2D 2.0
import "../../core"
......
......@@ -18,7 +18,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
import Box2D 2.0
import QtGraphicalEffects 1.0
......
......@@ -18,13 +18,13 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import QtQuick.Window 2.1
import QtSensors 5.0
import QtGraphicalEffects 1.0
import GCompris 1.0
import Box2D 2.0
import QtQuick.Controls 1.0
import QtQuick.Controls 1.5
import "../../core"
......
......@@ -18,7 +18,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
import Box2D 2.0
import "../../core"
......
......@@ -19,7 +19,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
import GCompris 1.0
import Box2D 2.0
import QtGraphicalEffects 1.0
......
......@@ -27,7 +27,7 @@
arbitrary order
*/
.pragma library
.import QtQuick 2.0 as Quick
.import QtQuick 2.6 as Quick
.import GCompris 1.0 as GCompris
.import Box2D 2.0 as Box2D
.import "qrc:/gcompris/src/core/core.js" as Core
......@@ -309,7 +309,7 @@ function initMap()
if (debugDraw) {
try {
var rect = Qt.createQmlObject(
"import QtQuick 2.0;Rectangle{"
"import QtQuick 2.6;Rectangle{"
+"width:" + items.cellSize +";"
+"height:" + items.cellSize+";"
+"x:" + x + ";"
......
......@@ -18,10 +18,10 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import QtGraphicalEffects 1.0
import GCompris 1.0
import QtQuick.Controls 1.0
import QtQuick.Controls 1.5
import "../../../core"
import ".."
......
......@@ -19,7 +19,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick 2.6
import GCompris 1.0
Item {
......
......@@ -20,7 +20,7 @@
*/
.pragma library
.import QtQuick 2.0 as Quick
.import QtQuick 2.6 as Quick
.import GCompris 1.0 as GCompris
.import "qrc:/gcompris/src/core/core.js" as Core
......
......@@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import "ballcatch.js" as Activity
import GCompris 1.0
......
......@@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import GCompris 1.0
import "../../core"
......
......@@ -20,7 +20,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import GCompris 1.0
import "questions.js" as Dataset
......
......@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.6
import QtMultimedia 5.0
import "braille_alphabets.js" as Activity
import "../../core"
......