Index: external/qml-box2d =================================================================== --- external/qml-box2d +++ external/qml-box2d @@ -1 +1 @@ -Subproject commit 1308855477d5c7fdae0de3d50168a6765af1ad78 +Subproject commit 1308855477d5c7fdae0de3d50168a6765af1ad78-dirty Index: src/activities/babymatch/resource/board/board1_0.qml =================================================================== --- src/activities/babymatch/resource/board/board1_0.qml +++ src/activities/babymatch/resource/board/board1_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Drag and Drop the items to make them match") - property variant levels : [ + property var levels : [ { "pixmapfile" : "images/lamp.svg", "x" : "0.2", Index: src/activities/babymatch/resource/board/board2_0.qml =================================================================== --- src/activities/babymatch/resource/board/board2_0.qml +++ src/activities/babymatch/resource/board/board2_0.qml @@ -22,7 +22,7 @@ import QtQuick 2.6 QtObject { - property variant levels: [ + property var levels: [ { "pixmapfile" : "images/flowerpot.svg", "x" : "0.8", Index: src/activities/babymatch/resource/board/board3_0.qml =================================================================== --- src/activities/babymatch/resource/board/board3_0.qml +++ src/activities/babymatch/resource/board/board3_0.qml @@ -22,7 +22,7 @@ import QtQuick 2.6 QtObject { - property variant levels: [ + property var levels: [ { "pixmapfile" : "images/house.svg", "x" : "0.5", Index: src/activities/babymatch/resource/board/board4_0.qml =================================================================== --- src/activities/babymatch/resource/board/board4_0.qml +++ src/activities/babymatch/resource/board/board4_0.qml @@ -22,7 +22,7 @@ import QtQuick 2.6 QtObject { - property variant levels: [ + property var levels: [ { "pixmapfile" : "images/rape.svg", "x" : "0.8", Index: src/activities/babymatch/resource/board/board5_0.qml =================================================================== --- src/activities/babymatch/resource/board/board5_0.qml +++ src/activities/babymatch/resource/board/board5_0.qml @@ -22,7 +22,7 @@ import QtQuick 2.6 QtObject { - property variant levels: [ + property var levels: [ { "pixmapfile" : "images/postcard.svg", "x" : "0.2", Index: src/activities/babymatch/resource/board/board6_0.qml =================================================================== --- src/activities/babymatch/resource/board/board6_0.qml +++ src/activities/babymatch/resource/board/board6_0.qml @@ -22,7 +22,7 @@ import QtQuick 2.6 QtObject { - property variant levels: [ + property var levels: [ { "pixmapfile" : "images/crown.svg", "x" : "0.2", Index: src/activities/babymatch/resource/board/board7_0.qml =================================================================== --- src/activities/babymatch/resource/board/board7_0.qml +++ src/activities/babymatch/resource/board/board7_0.qml @@ -22,7 +22,7 @@ import QtQuick 2.6 QtObject { - property variant levels: [ + property var levels: [ { "pixmapfile" : "images/bell.svg", "x" : "0.5", Index: src/activities/babyshapes/resource/board/board1_0.qml =================================================================== --- src/activities/babyshapes/resource/board/board1_0.qml +++ src/activities/babyshapes/resource/board/board1_0.qml @@ -24,7 +24,7 @@ QtObject { property string instruction: qsTr("Drag and Drop the items to make them match") - property variant levels: [ + property var levels: [ { "pixmapfile" : "food/baby_bottle.png", "x" : "0.5", Index: src/activities/babyshapes/resource/board/board2_0.qml =================================================================== --- src/activities/babyshapes/resource/board/board2_0.qml +++ src/activities/babyshapes/resource/board/board2_0.qml @@ -22,7 +22,7 @@ import QtQuick 2.6 QtObject { - property variant levels: [ + property var levels: [ { "pixmapfile" : "food/bread_slice.png", "x" : "0.5", Index: src/activities/babyshapes/resource/board/board3_0.qml =================================================================== --- src/activities/babyshapes/resource/board/board3_0.qml +++ src/activities/babyshapes/resource/board/board3_0.qml @@ -22,7 +22,7 @@ import QtQuick 2.6 QtObject { - property variant levels: [ + property var levels: [ { "pixmapfile" : "food/pear.png", "x" : "0.2", Index: src/activities/babyshapes/resource/board/board4_0.qml =================================================================== --- src/activities/babyshapes/resource/board/board4_0.qml +++ src/activities/babyshapes/resource/board/board4_0.qml @@ -22,7 +22,7 @@ import QtQuick 2.6 QtObject { - property variant levels: [ + property var levels: [ { "pixmapfile" : "food/yahourt.png", "x" : "0.5", Index: src/activities/babyshapes/resource/board/board5_0.qml =================================================================== --- src/activities/babyshapes/resource/board/board5_0.qml +++ src/activities/babyshapes/resource/board/board5_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Hello! My name is Lock.") - property variant levels: [ + property var levels: [ { "pixmapfile" : "dog1/dog.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/babyshapes/resource/board/board6_0.qml =================================================================== --- src/activities/babyshapes/resource/board/board6_0.qml +++ src/activities/babyshapes/resource/board/board6_0.qml @@ -24,7 +24,7 @@ QtObject { property string instruction: qsTr("Lock with colored shapes.") property bool glow: false - property variant levels: [ + property var levels: [ { "pixmapfile" : "dog3/dog.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/babyshapes/resource/board/board7_0.qml =================================================================== --- src/activities/babyshapes/resource/board/board7_0.qml +++ src/activities/babyshapes/resource/board/board7_0.qml @@ -24,7 +24,7 @@ QtObject { property int numberOfSubLevel: 4 property string instruction: qsTr("Paul Gauguin, Arearea - 1892") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/Paul_Gauguin_006_background.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/babyshapes/resource/board/board7_1.qml =================================================================== --- src/activities/babyshapes/resource/board/board7_1.qml +++ src/activities/babyshapes/resource/board/board7_1.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Pieter Bruegel the Elder, The peasants wedding - 1568") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/Pieter_Bruegel_background.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/babyshapes/resource/board/board7_2.qml =================================================================== --- src/activities/babyshapes/resource/board/board7_2.qml +++ src/activities/babyshapes/resource/board/board7_2.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("The Lady and the Unicorn - XVe century") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/lady_unicorn_background.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/babyshapes/resource/board/board7_3.qml =================================================================== --- src/activities/babyshapes/resource/board/board7_3.qml +++ src/activities/babyshapes/resource/board/board7_3.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Vincent van Gogh, Bedroom in Arles - 1888") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/Van_Gogh_0011_background.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/babyshapes/resource/board/board7_4.qml =================================================================== --- src/activities/babyshapes/resource/board/board7_4.qml +++ src/activities/babyshapes/resource/board/board7_4.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Ambrosius Bosschaert the Elder, Flower Still Life - 1614") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/Bosschaert_04_background.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/braille_alphabets/BrailleChar.qml =================================================================== --- src/activities/braille_alphabets/BrailleChar.qml +++ src/activities/braille_alphabets/BrailleChar.qml @@ -34,7 +34,7 @@ property alias circles: circles property bool clickable property bool isLetter: brailleChar >= 'A' && brailleChar <= 'Z' - property variant brailleCodesLetter: { + property var brailleCodesLetter: { // For ASCII each letter, this represent the active dots in Braille. "A": [1], "B": [1, 2], "C": [1, 4], "D": [1, 4, 5], "E": [1, 5], "F": [1, 2, 4], "G": [1, 2, 4, 5], "H": [1, 2, 5], "I": [2, 4], @@ -44,14 +44,14 @@ "V": [1, 2, 3, 6], "W": [2, 4, 5, 6], "X": [1, 3, 4, 6], "Y": [1, 3, 4, 5, 6], "Z": [1, 3, 5, 6] } - property variant brailleCodesNumber: { + property var brailleCodesNumber: { // For ASCII each letter, this represent the active dots in Braille. "+": [3, 4, 6], "-": [3, 6], "*": [1, 6], "/": [3, 4], "#": [3, 4, 5, 6], "1": [1], "2" :[1, 2], "3": [1, 4], "4": [1, 4, 5], "5": [1, 5], "6": [1, 2, 4], "7": [1, 2, 4, 5], "8": [1, 2, 5], "9": [2, 4], "0" :[3, 5, 6] } - property variant brailleCodes: isLetter ? brailleCodesLetter : brailleCodesNumber + property var brailleCodes: isLetter ? brailleCodesLetter : brailleCodesNumber function updateDotsFromBrailleChar() { var dots = [] Index: src/activities/categorization/Categorization.qml =================================================================== --- src/activities/categorization/Categorization.qml +++ src/activities/categorization/Categorization.qml @@ -36,7 +36,7 @@ property string boardsUrl: ":/gcompris/src/activities/categorization/resource/board/" property bool vert: background.width < background.height - property variant barAtStart + property var barAtStart pageComponent: Image { id: background Index: src/activities/categorization/resource/board/category_alphabets.qml =================================================================== --- src/activities/categorization/resource/board/category_alphabets.qml +++ src/activities/categorization/resource/board/category_alphabets.qml @@ -24,7 +24,7 @@ property bool isEmbedded: true property bool allowExpertMode: true property string imagesPrefix: "qrc:/gcompris/src/activities/categorization/resource/images/alphabets/" - property variant levels: [ + property var levels: [ { "name": qsTr("Alphabets"), "image": imagesPrefix + "alphabets.jpg", Index: src/activities/categorization/resource/board/category_animals.qml =================================================================== --- src/activities/categorization/resource/board/category_animals.qml +++ src/activities/categorization/resource/board/category_animals.qml @@ -24,7 +24,7 @@ property bool isEmbedded: false property bool allowExpertMode: true property string imagesPrefix: "qrc:/gcompris/data/words/animals/" - property variant levels:[ + property var levels:[ { "type": "lesson", "name": qsTr("Animals"), Index: src/activities/categorization/resource/board/category_birds.qml =================================================================== --- src/activities/categorization/resource/board/category_birds.qml +++ src/activities/categorization/resource/board/category_birds.qml @@ -24,7 +24,7 @@ property bool isEmbedded: false property bool allowExpertMode: true property string imagesPrefix: "qrc:/gcompris/data/words/birds/" - property variant levels: [ + property var levels: [ { "type": "lesson", "name": qsTr("Birds"), Index: src/activities/categorization/resource/board/category_colors.qml =================================================================== --- src/activities/categorization/resource/board/category_colors.qml +++ src/activities/categorization/resource/board/category_colors.qml @@ -24,7 +24,7 @@ property bool isEmbedded: false property bool allowExpertMode: true property string imagesPrefix: "qrc:/gcompris/data/words/" - property variant levels: [ + property var levels: [ { "type": "lesson", "name": qsTr("Colors"), Index: src/activities/categorization/resource/board/category_fishes.qml =================================================================== --- src/activities/categorization/resource/board/category_fishes.qml +++ src/activities/categorization/resource/board/category_fishes.qml @@ -24,7 +24,7 @@ property bool isEmbedded: true property bool allowExpertMode: true property string imagesPrefix: "qrc:/gcompris/src/activities/categorization/resource/images/fishes/" - property variant levels: [ + property var levels: [ { "type": "lesson", "name": qsTr("fishes"), Index: src/activities/categorization/resource/board/category_food.qml =================================================================== --- src/activities/categorization/resource/board/category_food.qml +++ src/activities/categorization/resource/board/category_food.qml @@ -24,7 +24,7 @@ property bool isEmbedded: false property bool allowExpertMode: true property string imagesPrefix: "qrc:/gcompris/data/words/food/" - property variant levels: [ + property var levels: [ { "type": "lesson", "name": qsTr("Food"), Index: src/activities/categorization/resource/board/category_fruits.qml =================================================================== --- src/activities/categorization/resource/board/category_fruits.qml +++ src/activities/categorization/resource/board/category_fruits.qml @@ -24,7 +24,7 @@ property bool isEmbedded: false property bool allowExpertMode: true property string imagesPrefix: "qrc:/gcompris/src/activities/lang/resource/words_sample/" - property variant levels: [ + property var levels: [ { "type": "lesson", "name": qsTr("Fruits"), Index: src/activities/categorization/resource/board/category_household_goods.qml =================================================================== --- src/activities/categorization/resource/board/category_household_goods.qml +++ src/activities/categorization/resource/board/category_household_goods.qml @@ -24,7 +24,7 @@ property bool isEmbedded: false property bool allowExpertMode: true property string imagesPrefix: "qrc:/gcompris/data/words/householdGoods/" - property variant levels: [ + property var levels: [ { "type": "lesson", "name": qsTr("Household goods"), Index: src/activities/categorization/resource/board/category_insects.qml =================================================================== --- src/activities/categorization/resource/board/category_insects.qml +++ src/activities/categorization/resource/board/category_insects.qml @@ -24,7 +24,7 @@ property bool isEmbedded: false property bool allowExpertMode: true property string imagesPrefix: "qrc:/gcompris/data/words/insects/" - property variant levels: [ + property var levels: [ { "type": "lesson", "name": qsTr("Insects"), Index: src/activities/categorization/resource/board/category_living_beings.qml =================================================================== --- src/activities/categorization/resource/board/category_living_beings.qml +++ src/activities/categorization/resource/board/category_living_beings.qml @@ -24,7 +24,7 @@ property bool isEmbedded: false property bool allowExpertMode: true property string imagesPrefix: "qrc:/gcompris/data/words/" - property variant levels: [ + property var levels: [ { "type": "lesson", "name": qsTr("Living"), Index: src/activities/categorization/resource/board/category_monuments.qml =================================================================== --- src/activities/categorization/resource/board/category_monuments.qml +++ src/activities/categorization/resource/board/category_monuments.qml @@ -24,7 +24,7 @@ property bool isEmbedded: true property bool allowExpertMode: true property string imagesPrefix: "qrc:/gcompris/src/activities/categorization/resource/images/monuments/" - property variant levels: [ + property var levels: [ { "type": "lesson", "name": qsTr("Monuments"), Index: src/activities/categorization/resource/board/category_nature.qml =================================================================== --- src/activities/categorization/resource/board/category_nature.qml +++ src/activities/categorization/resource/board/category_nature.qml @@ -24,7 +24,7 @@ property bool isEmbedded: false property bool allowExpertMode: true property string imagesPrefix: "qrc:/gcompris/data/words/nature/" - property variant levels: [ + property var levels: [ { "type": "lesson", "name": qsTr("Nature"), Index: src/activities/categorization/resource/board/category_numbers.qml =================================================================== --- src/activities/categorization/resource/board/category_numbers.qml +++ src/activities/categorization/resource/board/category_numbers.qml @@ -24,7 +24,7 @@ property bool isEmbedded: true property bool allowExpertMode: true property string imagesPrefix: "qrc:/gcompris/src/activities/categorization/resource/images/numbers/" - property variant levels: [ + property var levels: [ { "type": "lesson", "name": qsTr("Numbers"), Index: src/activities/categorization/resource/board/category_odd_even.qml =================================================================== --- src/activities/categorization/resource/board/category_odd_even.qml +++ src/activities/categorization/resource/board/category_odd_even.qml @@ -25,7 +25,7 @@ property bool isEmbedded: false property bool allowExpertMode: false property string imagesPrefix: "qrc:/gcompris/data/words/numbers/" - property variant levels: [ + property var levels: [ { "type": "lesson", "name": qsTr("odd even numbers"), Index: src/activities/categorization/resource/board/category_renewable.qml =================================================================== --- src/activities/categorization/resource/board/category_renewable.qml +++ src/activities/categorization/resource/board/category_renewable.qml @@ -24,7 +24,7 @@ property bool isEmbedded: true property bool allowExpertMode: true property string imagesPrefix: "qrc:/gcompris/src/activities/categorization/resource/images/renewable/" - property variant levels: [ + property var levels: [ { "type": "lesson", "name": qsTr("Renewable"), Index: src/activities/categorization/resource/board/category_shapes.qml =================================================================== --- src/activities/categorization/resource/board/category_shapes.qml +++ src/activities/categorization/resource/board/category_shapes.qml @@ -26,7 +26,7 @@ property bool isEmbedded: false property bool allowExpertMode: true property string imagesPrefix: "qrc:/gcompris/data/words/shapes/" - property variant levels: [ + property var levels: [ { "type": "lesson", "name": qsTr("Shapes"), Index: src/activities/categorization/resource/board/category_tools.qml =================================================================== --- src/activities/categorization/resource/board/category_tools.qml +++ src/activities/categorization/resource/board/category_tools.qml @@ -24,7 +24,7 @@ property bool isEmbedded: true property bool allowExpertMode: true property string imagesPrefix: "qrc:/gcompris/src/activities/categorization/resource/images/tools/" - property variant levels: [ + property var levels: [ { "type": "lesson", "name": qsTr("Tools"), Index: src/activities/categorization/resource/board/category_transports.qml =================================================================== --- src/activities/categorization/resource/board/category_transports.qml +++ src/activities/categorization/resource/board/category_transports.qml @@ -24,7 +24,7 @@ property bool isEmbedded: false property bool allowExpertMode: true property string imagesPrefix: "qrc:/gcompris/data/words/transport/" - property variant levels: [ + property var levels: [ { "type": "lesson", "name": qsTr("Transport"), Index: src/activities/categorization/resource/board/category_vegetables.qml =================================================================== --- src/activities/categorization/resource/board/category_vegetables.qml +++ src/activities/categorization/resource/board/category_vegetables.qml @@ -24,7 +24,7 @@ property bool isEmbedded: false property bool allowExpertMode: true property string imagesPrefix: "qrc:/gcompris/data/words/vegetables/" - property variant levels: [ + property var levels: [ { "type": "lesson", "name": qsTr("Vegetables"), Index: src/activities/checkers/Checkers.qml =================================================================== --- src/activities/checkers/Checkers.qml +++ src/activities/checkers/Checkers.qml @@ -64,7 +64,7 @@ Math.min(background.width / (items.numberOfCases + 2), (background.height - controls.height) / (items.numberOfCases + barHeightAddon)) : Math.min(background.width / (items.numberOfCases + 2), background.height / (items.numberOfCases + barHeightAddon)) - property variant fen: activity.fen + property var fen: activity.fen property bool twoPlayer: activity.twoPlayers property bool difficultyByLevel: activity.difficultyByLevel property var positions Index: src/activities/chess/Chess.qml =================================================================== --- src/activities/chess/Chess.qml +++ src/activities/chess/Chess.qml @@ -35,7 +35,7 @@ property bool twoPlayers: false // difficultyByLevel means that at level 1 computer is bad better at last level property bool difficultyByLevel: true - property variant fen: [ + property var fen: [ ["initial state", "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 1 1"], ["initial state", "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 1 1"], ["initial state", "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 1 1"], @@ -72,7 +72,7 @@ Math.min(background.width / (8 + 2), (background.height - controls.height) / (8 + barHeightAddon)) : Math.min(background.width / (8 + 2), background.height / (8 + barHeightAddon)) - property variant fen: activity.fen + property var fen: activity.fen property bool twoPlayer: activity.twoPlayers property bool difficultyByLevel: activity.difficultyByLevel property var positions Index: src/activities/chronos/resource/board/board1_0.qml =================================================================== --- src/activities/chronos/resource/board/board1_0.qml +++ src/activities/chronos/resource/board/board1_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Moonwalker") - property variant levels: [ + property var levels: [ { "pixmapfile": "images/bg.jpg", "type": "SHAPE_BACKGROUND_IMAGE" Index: src/activities/chronos/resource/board/board2_0.qml =================================================================== --- src/activities/chronos/resource/board/board2_0.qml +++ src/activities/chronos/resource/board/board2_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("The 4 Seasons") - property variant levels: [ + property var levels: [ { "pixmapfile": "images/autumn.svg", "x": 0.25, Index: src/activities/chronos/resource/board/board3_0.qml =================================================================== --- src/activities/chronos/resource/board/board3_0.qml +++ src/activities/chronos/resource/board/board3_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Gardening") - property variant levels: [ + property var levels: [ { "pixmapfile": "images/garden1.svg", "x": 0.25, Index: src/activities/chronos/resource/board/board4_0.qml =================================================================== --- src/activities/chronos/resource/board/board4_0.qml +++ src/activities/chronos/resource/board/board4_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Tux and the apple tree") - property variant levels: [ + property var levels: [ { "pixmapfile": "images/chronos-tuxtree3.svg", "x": "0.25", Index: src/activities/chronos/resource/board/board5_0.qml =================================================================== --- src/activities/chronos/resource/board/board5_0.qml +++ src/activities/chronos/resource/board/board5_0.qml @@ -24,7 +24,7 @@ QtObject { property int numberOfSubLevel: 4 property string instruction: qsTr("Place each image in the order and on the date it was invented.") - property variant levels: [ + property var levels: [ { "pixmapfile": "images/fardier.svg", "x": 0.7, Index: src/activities/chronos/resource/board/board5_1.qml =================================================================== --- src/activities/chronos/resource/board/board5_1.qml +++ src/activities/chronos/resource/board/board5_1.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Transportation") - property variant levels: [ + property var levels: [ { "pixmapfile": "images/helico_cornu.svg", "x": 0.75, Index: src/activities/chronos/resource/board/board5_2.qml =================================================================== --- src/activities/chronos/resource/board/board5_2.qml +++ src/activities/chronos/resource/board/board5_2.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Transportation") - property variant levels: [ + property var levels: [ { "pixmapfile": "images/celerifere.svg", "x": 0.2, Index: src/activities/chronos/resource/board/board5_3.qml =================================================================== --- src/activities/chronos/resource/board/board5_3.qml +++ src/activities/chronos/resource/board/board5_3.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Transportation") - property variant levels: [ + property var levels: [ { "pixmapfile": "images/celerifere.svg", "x": "0.2", Index: src/activities/chronos/resource/board/board5_4.qml =================================================================== --- src/activities/chronos/resource/board/board5_4.qml +++ src/activities/chronos/resource/board/board5_4.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Transportation") - property variant levels: [ + property var levels: [ { "pixmapfile": "images/st_rocket.svg", "x": 0.2, Index: src/activities/chronos/resource/board/board6_0.qml =================================================================== --- src/activities/chronos/resource/board/board6_0.qml +++ src/activities/chronos/resource/board/board6_0.qml @@ -24,7 +24,7 @@ QtObject { property int numberOfSubLevel: 3 property string instruction: qsTr("Aviation") - property variant levels: [ + property var levels: [ { "pixmapfile": "images/Eole.svg", "x": "0.2", Index: src/activities/chronos/resource/board/board6_1.qml =================================================================== --- src/activities/chronos/resource/board/board6_1.qml +++ src/activities/chronos/resource/board/board6_1.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Aviation") - property variant levels: [ + property var levels: [ { "pixmapfile": "images/bell_X1.svg", "x": 0.2, Index: src/activities/chronos/resource/board/board6_2.qml =================================================================== --- src/activities/chronos/resource/board/board6_2.qml +++ src/activities/chronos/resource/board/board6_2.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Cars") - property variant levels: [ + property var levels: [ { "pixmapfile": "images/bolle1878.svg", "x": "0.2", Index: src/activities/chronos/resource/board/board6_3.qml =================================================================== --- src/activities/chronos/resource/board/board6_3.qml +++ src/activities/chronos/resource/board/board6_3.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Cars") - property variant levels: [ + property var levels: [ { "pixmapfile": "images/renault1899.svg", "x": 0.2, Index: src/activities/details/resource/board/board10_0.qml =================================================================== --- src/activities/details/resource/board/board10_0.qml +++ src/activities/details/resource/board/board10_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Eilean Donan castle") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/EilanDonanCastle_background.jpg", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/details/resource/board/board11_0.qml =================================================================== --- src/activities/details/resource/board/board11_0.qml +++ src/activities/details/resource/board/board11_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Gizah Pyramids, Egypt") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/GizahPyramids_background.jpg", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/details/resource/board/board12_0.qml =================================================================== --- src/activities/details/resource/board/board12_0.qml +++ src/activities/details/resource/board/board12_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Sydney Opera House, Australia") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/OperaSidney_background.jpg", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/details/resource/board/board13_0.qml =================================================================== --- src/activities/details/resource/board/board13_0.qml +++ src/activities/details/resource/board/board13_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Tower Bridge in London") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/TowerBridgeLondon_background.jpg", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/details/resource/board/board14_0.qml =================================================================== --- src/activities/details/resource/board/board14_0.qml +++ src/activities/details/resource/board/board14_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Eiffel Tower, seen from the champ de Mars, Paris, France") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/TourEiffel_background.jpg", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/details/resource/board/board15_0.qml =================================================================== --- src/activities/details/resource/board/board15_0.qml +++ src/activities/details/resource/board/board15_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Courtyard of the Museum of Louvre, and its pyramid") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/Louvre_2007_02_24_c_background.jpg", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/details/resource/board/board16_0.qml =================================================================== --- src/activities/details/resource/board/board16_0.qml +++ src/activities/details/resource/board/board16_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Panorama of Château de Chenonceau, Indre-et-Loire, France.") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/Chenonceau_background.jpg", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/details/resource/board/board17_0.qml =================================================================== --- src/activities/details/resource/board/board17_0.qml +++ src/activities/details/resource/board/board17_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Windmill in Sønderho, Fanø, Denmark") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/FanoeWindmill_background.jpg", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/details/resource/board/board18_0.qml =================================================================== --- src/activities/details/resource/board/board18_0.qml +++ src/activities/details/resource/board/board18_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Nagoya Castle, Aichi Prefecture, Japan.") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/Nagoya_background.jpg", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/details/resource/board/board19_0.qml =================================================================== --- src/activities/details/resource/board/board19_0.qml +++ src/activities/details/resource/board/board19_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Taj Mahal, Agra, India") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/TajMahal_background.jpg", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/details/resource/board/board1_0.qml =================================================================== --- src/activities/details/resource/board/board1_0.qml +++ src/activities/details/resource/board/board1_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Vincent van Gogh, Entrance Hall of Saint-Paul Hospital - 1889") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/VincentVanGogh0012_background.jpg", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/details/resource/board/board20_0.qml =================================================================== --- src/activities/details/resource/board/board20_0.qml +++ src/activities/details/resource/board/board20_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Castle Neuschwanstein at Schwangau, Bavaria, Germany") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/Neuschwanstein_background.jpg", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/details/resource/board/board21_0.qml =================================================================== --- src/activities/details/resource/board/board21_0.qml +++ src/activities/details/resource/board/board21_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Egeskov Castle, Denmark") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/EgeskovSlotSpejling_background.jpg", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/details/resource/board/board2_0.qml =================================================================== --- src/activities/details/resource/board/board2_0.qml +++ src/activities/details/resource/board/board2_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Vincent van Gogh, The Bridge of Langlois at Arles with a lady with umbrella - 1888") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/VincentVanGoghBridge_background.jpg", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/details/resource/board/board3_0.qml =================================================================== --- src/activities/details/resource/board/board3_0.qml +++ src/activities/details/resource/board/board3_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Vincent van Gogh, The Church at Auvers-sur-Oise - 1890") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/Eglise_dAuvers-sur-Oise_background.jpg", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/details/resource/board/board4_0.qml =================================================================== --- src/activities/details/resource/board/board4_0.qml +++ src/activities/details/resource/board/board4_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Vincent van Gogh, Painter on His Way to Work - 1888") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/VincentVanGogh0013_background.jpg", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/details/resource/board/board5_0.qml =================================================================== --- src/activities/details/resource/board/board5_0.qml +++ src/activities/details/resource/board/board5_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Vincent van Gogh, The Harvest - 1888") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/VincentVanGogh0019_background.jpg", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/details/resource/board/board6_0.qml =================================================================== --- src/activities/details/resource/board/board6_0.qml +++ src/activities/details/resource/board/board6_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Vincent van Gogh, Cafe Terrace at Night - 1888") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/Gogh4_background.jpg", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/details/resource/board/board7_0.qml =================================================================== --- src/activities/details/resource/board/board7_0.qml +++ src/activities/details/resource/board/board7_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Vincent van Gogh, The Night Café - 1888") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/Van_Gogh_The_Night_Cafe_background.jpg", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/details/resource/board/board8_0.qml =================================================================== --- src/activities/details/resource/board/board8_0.qml +++ src/activities/details/resource/board/board8_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Vincent van Gogh, Portrait of Pere Tanguy 1887-8") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/PortraitOfPereTanguy_background.jpg", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/details/resource/board/board9_0.qml =================================================================== --- src/activities/details/resource/board/board9_0.qml +++ src/activities/details/resource/board/board9_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Notre Dame de Paris cathedral on the Île de la Cité island in Paris, France.") - property variant levels: [ + property var levels: [ { "pixmapfile" : "image/NDP_background.jpg", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/explore_farm_animals/AnimalLevels.qml =================================================================== --- src/activities/explore_farm_animals/AnimalLevels.qml +++ src/activities/explore_farm_animals/AnimalLevels.qml @@ -44,7 +44,7 @@ property string question property string audio - signal displayDescription(variant animal) + signal displayDescription(var animal) SequentialAnimation { id: anim Index: src/activities/geo-country/resource/board/board10_0.qml =================================================================== --- src/activities/geo-country/resource/board/board10_0.qml +++ src/activities/geo-country/resource/board/board10_0.qml @@ -24,7 +24,7 @@ QtObject { property int numberOfSubLevel: 1 property string instruction: qsTr("United States of America") - property variant levels: [ + property var levels: [ { "pixmapfile" : "usa/background.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board10_1.qml =================================================================== --- src/activities/geo-country/resource/board/board10_1.qml +++ src/activities/geo-country/resource/board/board10_1.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("United States of America") - property variant levels: [ + property var levels: [ { "pixmapfile" : "usa/background1.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board11_0.qml =================================================================== --- src/activities/geo-country/resource/board/board11_0.qml +++ src/activities/geo-country/resource/board/board11_0.qml @@ -24,7 +24,7 @@ QtObject { property int numberOfSubLevel: 3 property string instruction: qsTr("Districts of Italy") - property variant levels: [ + property var levels: [ { "pixmapfile" : "italy/backgrounditaly.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board11_1.qml =================================================================== --- src/activities/geo-country/resource/board/board11_1.qml +++ src/activities/geo-country/resource/board/board11_1.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Districts of Northern Italy") - property variant levels: [ + property var levels: [ { "pixmapfile" : "italy/north/background.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board11_2.qml =================================================================== --- src/activities/geo-country/resource/board/board11_2.qml +++ src/activities/geo-country/resource/board/board11_2.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Districts of Central Italy") - property variant levels: [ + property var levels: [ { "pixmapfile" : "italy/central/background.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board11_3.qml =================================================================== --- src/activities/geo-country/resource/board/board11_3.qml +++ src/activities/geo-country/resource/board/board11_3.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Districts of Southern Italy") - property variant levels: [ + property var levels: [ { "pixmapfile" : "italy/south/background.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board12_0.qml =================================================================== --- src/activities/geo-country/resource/board/board12_0.qml +++ src/activities/geo-country/resource/board/board12_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("States of India") - property variant levels: [ + property var levels: [ { "pixmapfile" : "india/background.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board13_0.qml =================================================================== --- src/activities/geo-country/resource/board/board13_0.qml +++ src/activities/geo-country/resource/board/board13_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Districts of Australia") - property variant levels: [ + property var levels: [ { "pixmapfile" : "australia/background.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board14_0.qml =================================================================== --- src/activities/geo-country/resource/board/board14_0.qml +++ src/activities/geo-country/resource/board/board14_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Districts of China") - property variant levels: [ + property var levels: [ { "pixmapfile" : "china/background.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board15_0.qml =================================================================== --- src/activities/geo-country/resource/board/board15_0.qml +++ src/activities/geo-country/resource/board/board15_0.qml @@ -24,7 +24,7 @@ QtObject { property int numberOfSubLevel: 3 property string instruction: qsTr("Northern Scotland") - property variant levels: [ + property var levels: [ { "pixmapfile" : "scotland/bg_north.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board15_1.qml =================================================================== --- src/activities/geo-country/resource/board/board15_1.qml +++ src/activities/geo-country/resource/board/board15_1.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Southern Scotland") - property variant levels: [ + property var levels: [ { "pixmapfile" : "scotland/bg_south.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board15_2.qml =================================================================== --- src/activities/geo-country/resource/board/board15_2.qml +++ src/activities/geo-country/resource/board/board15_2.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Northern Scotland") - property variant levels: [ + property var levels: [ { "pixmapfile" : "scotland/bg_north_blank.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board15_3.qml =================================================================== --- src/activities/geo-country/resource/board/board15_3.qml +++ src/activities/geo-country/resource/board/board15_3.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Southern Scotland") - property variant levels: [ + property var levels: [ { "pixmapfile" : "scotland/bg_south_blank.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board16_0.qml =================================================================== --- src/activities/geo-country/resource/board/board16_0.qml +++ src/activities/geo-country/resource/board/board16_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Provinces of Romania") - property variant levels: [ + property var levels: [ { "pixmapfile" : "romania/background.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board1_0.qml =================================================================== --- src/activities/geo-country/resource/board/board1_0.qml +++ src/activities/geo-country/resource/board/board1_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Districts of France") - property variant levels: [ + property var levels: [ { "pixmapfile" : "france/france-regions.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board2_0.qml =================================================================== --- src/activities/geo-country/resource/board/board2_0.qml +++ src/activities/geo-country/resource/board/board2_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Districts of Germany") - property variant levels: [ + property var levels: [ { "pixmapfile" : "germany/back.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board3_0.qml =================================================================== --- src/activities/geo-country/resource/board/board3_0.qml +++ src/activities/geo-country/resource/board/board3_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Districts of Argentina") - property variant levels: [ + property var levels: [ { "pixmapfile" : "argentina/argentina.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board4_0.qml =================================================================== --- src/activities/geo-country/resource/board/board4_0.qml +++ src/activities/geo-country/resource/board/board4_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Districts of Poland") - property variant levels: [ + property var levels: [ { "pixmapfile" : "poland/poland.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board5_0.qml =================================================================== --- src/activities/geo-country/resource/board/board5_0.qml +++ src/activities/geo-country/resource/board/board5_0.qml @@ -24,7 +24,7 @@ QtObject { property int numberOfSubLevel: 2 property string instruction: qsTr("Districts of Turkey") - property variant levels: [ + property var levels: [ { "pixmapfile" : "turkey/turkey-west.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board5_1.qml =================================================================== --- src/activities/geo-country/resource/board/board5_1.qml +++ src/activities/geo-country/resource/board/board5_1.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Eastern Districts of Turkey") - property variant levels: [ + property var levels: [ { "pixmapfile" : "turkey/turkey-east.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board5_2.qml =================================================================== --- src/activities/geo-country/resource/board/board5_2.qml +++ src/activities/geo-country/resource/board/board5_2.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Districts of Turkey") - property variant levels: [ + property var levels: [ { "pixmapfile" : "turkey/turkey.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board6_0.qml =================================================================== --- src/activities/geo-country/resource/board/board6_0.qml +++ src/activities/geo-country/resource/board/board6_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Counties of Norway") - property variant levels: [ + property var levels: [ { "pixmapfile" : "norway/norway.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board7_0.qml =================================================================== --- src/activities/geo-country/resource/board/board7_0.qml +++ src/activities/geo-country/resource/board/board7_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Counties of Brazil") - property variant levels: [ + property var levels: [ { "pixmapfile" : "brazil/background.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board8_0.qml =================================================================== --- src/activities/geo-country/resource/board/board8_0.qml +++ src/activities/geo-country/resource/board/board8_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Districts of Canada") - property variant levels: [ + property var levels: [ { "pixmapfile" : "canada/background.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geo-country/resource/board/board9_0.qml =================================================================== --- src/activities/geo-country/resource/board/board9_0.qml +++ src/activities/geo-country/resource/board/board9_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Districts of Mexico") - property variant levels: [ + property var levels: [ { "pixmapfile" : "mexico/background.png", "type" : "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geography/resource/board/board10_0.qml =================================================================== --- src/activities/geography/resource/board/board10_0.qml +++ src/activities/geography/resource/board/board10_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Oceania") - property variant levels: [ + property var levels: [ { "pixmapfile": "oceania/bg_oceania.png", "type": "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geography/resource/board/board1_0.qml =================================================================== --- src/activities/geography/resource/board/board1_0.qml +++ src/activities/geography/resource/board/board1_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Continents") - property variant levels: [ + property var levels: [ { "pixmapfile": "continents/back.png", "type": "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geography/resource/board/board2_0.qml =================================================================== --- src/activities/geography/resource/board/board2_0.qml +++ src/activities/geography/resource/board/board2_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("North America") - property variant levels: [ + property var levels: [ { "pixmapfile": "northamerica/north_america.png", "type": "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geography/resource/board/board3_0.qml =================================================================== --- src/activities/geography/resource/board/board3_0.qml +++ src/activities/geography/resource/board/board3_0.qml @@ -24,7 +24,7 @@ QtObject { property int numberOfSubLevel: 1 property string instruction: qsTr("Central America") - property variant levels: [ + property var levels: [ { "pixmapfile": "centralamerica/bg_central_america.png", "type": "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geography/resource/board/board3_1.qml =================================================================== --- src/activities/geography/resource/board/board3_1.qml +++ src/activities/geography/resource/board/board3_1.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Central America") - property variant levels: [ + property var levels: [ { "pixmapfile": "centralamerica/bg_central_america_blank.png", "type": "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geography/resource/board/board4_0.qml =================================================================== --- src/activities/geography/resource/board/board4_0.qml +++ src/activities/geography/resource/board/board4_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("South America") - property variant levels: [ + property var levels: [ { "pixmapfile": "southamerica/south_america.png", "type": "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geography/resource/board/board5_0.qml =================================================================== --- src/activities/geography/resource/board/board5_0.qml +++ src/activities/geography/resource/board/board5_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Western Europe") - property variant levels: [ + property var levels: [ { "pixmapfile": "europe/europe.png", "type": "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geography/resource/board/board6_0.qml =================================================================== --- src/activities/geography/resource/board/board6_0.qml +++ src/activities/geography/resource/board/board6_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Eastern Europe") - property variant levels: [ + property var levels: [ { "pixmapfile": "europe/europe.png", "type": "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geography/resource/board/board7_0.qml =================================================================== --- src/activities/geography/resource/board/board7_0.qml +++ src/activities/geography/resource/board/board7_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Northern Africa") - property variant levels: [ + property var levels: [ { "pixmapfile": "africa/north_africa.png", "type": "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geography/resource/board/board8_0.qml =================================================================== --- src/activities/geography/resource/board/board8_0.qml +++ src/activities/geography/resource/board/board8_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Southern Africa") - property variant levels: [ + property var levels: [ { "pixmapfile": "africa/all_south_africa.png", "type": "SHAPE_BACKGROUND_IMAGE" Index: src/activities/geography/resource/board/board9_0.qml =================================================================== --- src/activities/geography/resource/board/board9_0.qml +++ src/activities/geography/resource/board/board9_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Asia") - property variant levels: [ + property var levels: [ { "pixmapfile": "asia/background.png", "type": "SHAPE_BACKGROUND_IMAGE" Index: src/activities/gletters/FallingDomino.qml =================================================================== --- src/activities/gletters/FallingDomino.qml +++ src/activities/gletters/FallingDomino.qml @@ -36,7 +36,7 @@ /// index into text.split("") where next typed match should occur property int unmatchedIndex: 0; property string text - property variant dominoValues + property var dominoValues property bool wonState: false signal won Index: src/activities/hangman/Hangman.qml =================================================================== --- src/activities/hangman/Hangman.qml +++ src/activities/hangman/Hangman.qml @@ -83,7 +83,7 @@ property alias locale: background.locale property alias ok: ok property int remainingLife - property variant goodWord + property var goodWord property int goodWordIndex property bool easyMode: false property alias englishFallbackDialog: englishFallbackDialog Index: src/activities/imagename/resource/board/board1_0.qml =================================================================== --- src/activities/imagename/resource/board/board1_0.qml +++ src/activities/imagename/resource/board/board1_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Drag and Drop each item onto its name") - property variant levels: [ + property var levels: [ { "pixmapfile": "images/postpoint.svg", "x": "0.2", Index: src/activities/imagename/resource/board/board2_0.qml =================================================================== --- src/activities/imagename/resource/board/board2_0.qml +++ src/activities/imagename/resource/board/board2_0.qml @@ -22,7 +22,7 @@ import QtQuick 2.6 QtObject { - property variant levels: [ + property var levels: [ { "pixmapfile": "images/bottle.svg", "x": "0.2", Index: src/activities/imagename/resource/board/board3_0.qml =================================================================== --- src/activities/imagename/resource/board/board3_0.qml +++ src/activities/imagename/resource/board/board3_0.qml @@ -22,7 +22,7 @@ import QtQuick 2.6 QtObject { - property variant levels: [ + property var levels: [ { "pixmapfile": "images/fusee.svg", "x": "0.2", Index: src/activities/imagename/resource/board/board4_0.qml =================================================================== --- src/activities/imagename/resource/board/board4_0.qml +++ src/activities/imagename/resource/board/board4_0.qml @@ -22,7 +22,7 @@ import QtQuick 2.6 QtObject { - property variant levels: [ + property var levels: [ { "pixmapfile": "images/apple.svg", "x": "0.2", Index: src/activities/imagename/resource/board/board5_0.qml =================================================================== --- src/activities/imagename/resource/board/board5_0.qml +++ src/activities/imagename/resource/board/board5_0.qml @@ -22,7 +22,7 @@ import QtQuick 2.6 QtObject { - property variant levels: [ + property var levels: [ { "pixmapfile": "images/pencil.svg", "x": "0.2", Index: src/activities/imagename/resource/board/board6_0.qml =================================================================== --- src/activities/imagename/resource/board/board6_0.qml +++ src/activities/imagename/resource/board/board6_0.qml @@ -22,7 +22,7 @@ import QtQuick 2.6 QtObject { - property variant levels: [ + property var levels: [ { "pixmapfile": "images/castle.svg", "x": "0.2", Index: src/activities/imagename/resource/board/board7_0.qml =================================================================== --- src/activities/imagename/resource/board/board7_0.qml +++ src/activities/imagename/resource/board/board7_0.qml @@ -22,7 +22,7 @@ import QtQuick 2.6 QtObject { - property variant levels: [ + property var levels: [ { "pixmapfile": "images/tree.svg", "x": "0.2", Index: src/activities/lang/Lang.qml =================================================================== --- src/activities/lang/Lang.qml +++ src/activities/lang/Lang.qml @@ -69,7 +69,7 @@ property alias englishFallbackDialog: englishFallbackDialog property string locale: 'system' property alias dialogActivityConfig: dialogActivityConfig - property variant categoriesTranslations: activity.categoriesTranslations + property var categoriesTranslations: activity.categoriesTranslations } onStart: { @@ -237,7 +237,7 @@ } } - property variant categoriesTranslations: {"otherChapter": qsTr("other"), + property var categoriesTranslations: {"otherChapter": qsTr("other"), "otherLesson": qsTr("other"), "action": qsTr("action"), "adjective": qsTr("adjective"), "color": qsTr("color"), "number": qsTr("number"), Index: src/activities/lang/Quiz.qml =================================================================== --- src/activities/lang/Quiz.qml +++ src/activities/lang/Quiz.qml @@ -41,7 +41,7 @@ property alias wordListModel: wordListModel property alias wordListView: wordListView property alias parser: parser - property variant goodWord + property var goodWord property bool horizontalLayout: background.width > background.height function init(loadedItems_, wordList_, mode_) { Index: src/activities/lang/SpellIt.qml =================================================================== --- src/activities/lang/SpellIt.qml +++ src/activities/lang/SpellIt.qml @@ -46,7 +46,7 @@ property alias bonus: bonus property alias keyboard: keyboard property alias score: score - property variant goodWord + property var goodWord property int goodWordIndex property int maximumLengthAnswer Index: src/activities/memory/CardItem.qml =================================================================== --- src/activities/memory/CardItem.qml +++ src/activities/memory/CardItem.qml @@ -28,7 +28,7 @@ Flipable { id: card - property variant pairData + property var pairData property bool isBack: true property bool isShown: false property bool isFound: false Index: src/activities/memory/MemoryCommon.qml =================================================================== --- src/activities/memory/MemoryCommon.qml +++ src/activities/memory/MemoryCommon.qml @@ -66,7 +66,7 @@ property int selectionCount property int tuxScore: tuxScore.text property int playerScore: playerScore.text - property variant dataset: activity.dataset + property var dataset: activity.dataset property alias containerModel: containerModel property alias cardRepeater: cardRepeater property alias grid: grid Index: src/activities/menu/ConfigurationItem.qml =================================================================== --- src/activities/menu/ConfigurationItem.qml +++ src/activities/menu/ConfigurationItem.qml @@ -708,7 +708,7 @@ } } - property variant fontCapitalizationModel: [ + property var fontCapitalizationModel: [ { text: qsTr("Mixed case (default)"), value: Font.MixedCase }, { text: qsTr("All uppercase"), value: Font.AllUppercase }, { text: qsTr("All lowercase"), value: Font.AllLowercase } Index: src/activities/menu/Menu.qml =================================================================== --- src/activities/menu/Menu.qml +++ src/activities/menu/Menu.qml @@ -79,7 +79,7 @@ // @cond INTERNAL_DOCS property string url: "qrc:/gcompris/src/activities/menu/resource/" property string inputText: "" - property variant sections: [ + property var sections: [ { icon: activity.url + "all.svg", tag: "favorite" Index: src/activities/money/MoneyCore.qml =================================================================== --- src/activities/money/MoneyCore.qml +++ src/activities/money/MoneyCore.qml @@ -30,7 +30,7 @@ onStart: focus = true onStop: {} - property variant dataset + property var dataset pageComponent: Image { id: background Index: src/activities/paintings/resource/board/board10_0.qml =================================================================== --- src/activities/paintings/resource/board/board10_0.qml +++ src/activities/paintings/resource/board/board10_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Katsushika Hokusai, Viewing Sunset over the Ryogoku Bridge from the Ommaya Embankment - 1830") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/paintings/resource/board/board11_0.qml =================================================================== --- src/activities/paintings/resource/board/board11_0.qml +++ src/activities/paintings/resource/board/board11_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Katsushika Hokusa, Poppies - 1833-1834") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/paintings/resource/board/board12_0.qml =================================================================== --- src/activities/paintings/resource/board/board12_0.qml +++ src/activities/paintings/resource/board/board12_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Katsushika Hokusai, Kazusa sea Route - 1830.") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/paintings/resource/board/board13_0.qml =================================================================== --- src/activities/paintings/resource/board/board13_0.qml +++ src/activities/paintings/resource/board/board13_0.qml @@ -24,7 +24,7 @@ QtObject { property int numberOfSubLevel: 4 property string instruction: qsTr("Michelangelo, Pieta - 1499") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/paintings/resource/board/board14_0.qml =================================================================== --- src/activities/paintings/resource/board/board14_0.qml +++ src/activities/paintings/resource/board/board14_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Leonardo da Vinci, Mona Lisa - 1503-19") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/paintings/resource/board/board15_0.qml =================================================================== --- src/activities/paintings/resource/board/board15_0.qml +++ src/activities/paintings/resource/board/board15_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Giovanni Bellini, La Pala di Pesaro - 1475-85") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/paintings/resource/board/board16_0.qml =================================================================== --- src/activities/paintings/resource/board/board16_0.qml +++ src/activities/paintings/resource/board/board16_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Albrecht Dürer, Lion - 1494") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/paintings/resource/board/board17_0.qml =================================================================== --- src/activities/paintings/resource/board/board17_0.qml +++ src/activities/paintings/resource/board/board17_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Pieter Brugel, The Harvesters - 1565") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/paintings/resource/board/board18_0.qml =================================================================== --- src/activities/paintings/resource/board/board18_0.qml +++ src/activities/paintings/resource/board/board18_0.qml @@ -24,7 +24,7 @@ QtObject { property int numberOfSubLevel: 1 property string instruction: qsTr("Pierre-Auguste Renoir, Girls At The Piano - 1892") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/paintings/resource/board/board19_0.qml =================================================================== --- src/activities/paintings/resource/board/board19_0.qml +++ src/activities/paintings/resource/board/board19_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Wassily Kandinsky, Composition VIII - 1923") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/paintings/resource/board/board1_0.qml =================================================================== --- src/activities/paintings/resource/board/board1_0.qml +++ src/activities/paintings/resource/board/board1_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr(" Pierre-Auguste Renoir, Le Moulin de la Galette - 1876") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/paintings/resource/board/board20_0.qml =================================================================== --- src/activities/paintings/resource/board/board20_0.qml +++ src/activities/paintings/resource/board/board20_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Bazille, The Ramparts at Aigues-Mortes - 1867") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/paintings/resource/board/board21_0.qml =================================================================== --- src/activities/paintings/resource/board/board21_0.qml +++ src/activities/paintings/resource/board/board21_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Mary Cassatt, Summertime - 1894") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/paintings/resource/board/board22_0.qml =================================================================== --- src/activities/paintings/resource/board/board22_0.qml +++ src/activities/paintings/resource/board/board22_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Vincent Van Gogh, Village Street in Auvers - 1890") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/paintings/resource/board/board2_0.qml =================================================================== --- src/activities/paintings/resource/board/board2_0.qml +++ src/activities/paintings/resource/board/board2_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Giuseppe Arcimboldo, Spring - 1573") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/paintings/resource/board/board3_0.qml =================================================================== --- src/activities/paintings/resource/board/board3_0.qml +++ src/activities/paintings/resource/board/board3_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Giuseppe Arcimboldo, The Librarian - 1566") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/paintings/resource/board/board4_0.qml =================================================================== --- src/activities/paintings/resource/board/board4_0.qml +++ src/activities/paintings/resource/board/board4_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Katsushika Hokusai, Oiran and Kamuro") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/paintings/resource/board/board5_0.qml =================================================================== --- src/activities/paintings/resource/board/board5_0.qml +++ src/activities/paintings/resource/board/board5_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Katsushika Hokusai, Woman holding a fan") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/paintings/resource/board/board6_0.qml =================================================================== --- src/activities/paintings/resource/board/board6_0.qml +++ src/activities/paintings/resource/board/board6_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Katsushika Hokusai, Ejiri in Suruga Province - 1830-1833") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/paintings/resource/board/board7_0.qml =================================================================== --- src/activities/paintings/resource/board/board7_0.qml +++ src/activities/paintings/resource/board/board7_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Katsushika Hokusai, The Great Wave off Kanagawa - 1823-1829") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/paintings/resource/board/board8_0.qml =================================================================== --- src/activities/paintings/resource/board/board8_0.qml +++ src/activities/paintings/resource/board/board8_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Utagawa Hiroshige, The Benzaiten Shrine at Inokashira in Snow - 1760-70") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/paintings/resource/board/board9_0.qml =================================================================== --- src/activities/paintings/resource/board/board9_0.qml +++ src/activities/paintings/resource/board/board9_0.qml @@ -23,7 +23,7 @@ QtObject { property string instruction: qsTr("Utagawa Hiroshige, Horse-mackerel and Prawn - 1840") - property variant levels : [ + property var levels : [ { "pixmapfile" : "image/bg.svg", "type" : "SHAPE_BACKGROUND_IMAGE", Index: src/activities/planegame/Planegame.qml =================================================================== --- src/activities/planegame/Planegame.qml +++ src/activities/planegame/Planegame.qml @@ -35,7 +35,7 @@ Keys.onPressed: Activity.processPressedKey(event) Keys.onReleased: Activity.processReleasedKey(event) - property variant dataset + property var dataset property int oldWidth: width onWidthChanged: { Index: src/activities/redraw/Redraw.qml =================================================================== --- src/activities/redraw/Redraw.qml +++ src/activities/redraw/Redraw.qml @@ -64,7 +64,7 @@ property int numberOfColor property int numberOfLine: targetModelData.length / numberOfColumn property alias targetModel: targetModel - property variant targetModelData + property var targetModelData } onStart: { Activity.start(items) } Index: src/activities/renewable_energy/RenewableEnergy.qml =================================================================== --- src/activities/renewable_energy/RenewableEnergy.qml +++ src/activities/renewable_energy/RenewableEnergy.qml @@ -30,7 +30,7 @@ onStop: {} property string url: "qrc:/gcompris/src/activities/renewable_energy/resource/" - property variant barAtStart + property var barAtStart property int oldWidth: width onWidthChanged: { Index: src/activities/scalesboard/Scalesboard.qml =================================================================== --- src/activities/scalesboard/Scalesboard.qml +++ src/activities/scalesboard/Scalesboard.qml @@ -29,7 +29,7 @@ ActivityBase { id: activity - property variant dataset + property var dataset onStart: focus = true onStop: {} @@ -61,7 +61,7 @@ property int numberOfSubLevels property int currentSubLevel property int giftWeight - property variant dataset: activity.dataset + property var dataset: activity.dataset property alias masseAreaCenter: masseAreaCenter property alias masseAreaLeft: masseAreaLeft property alias masseAreaRight: masseAreaRight Index: src/activities/share/resource/board/board0.qml =================================================================== --- src/activities/share/resource/board/board0.qml +++ src/activities/share/resource/board/board0.qml @@ -23,7 +23,7 @@ */ QtObject { - property variant levels : [ + property var levels : [ { "instruction": qsTr("Paul wants to equally share 2 candies between 2 of his friends: one girl and one boy. Can you help him? First, place the children in center, then drag the candies to each of them."), "totalBoys": 1, Index: src/activities/share/resource/board/board1.qml =================================================================== --- src/activities/share/resource/board/board1.qml +++ src/activities/share/resource/board/board1.qml @@ -23,7 +23,7 @@ */ QtObject { - property variant levels : [ + property var levels : [ { "instruction": qsTr("George wants to equally share 3 candies between 2 of his friends: one girl and one boy. Can he equally split the candies between his friends? First, place the children in center, then drag the candies to each of them. Be careful, a rest will remain!"), "totalBoys": 1, Index: src/activities/share/resource/board/board2.qml =================================================================== --- src/activities/share/resource/board/board2.qml +++ src/activities/share/resource/board/board2.qml @@ -23,7 +23,7 @@ */ QtObject { - property variant levels : [ + property var levels : [ { "instruction": qsTr("Alice wants to equally share 3 candies between 3 of her friends: one girl and two boys. Can you help her? First, place the children in the center, then drag the candies to each of them."), "totalBoys": 2, Index: src/activities/share/resource/board/board3.qml =================================================================== --- src/activities/share/resource/board/board3.qml +++ src/activities/share/resource/board/board3.qml @@ -23,7 +23,7 @@ */ QtObject { - property variant levels : [ + property var levels : [ { "instruction": qsTr("Michael wants to equally share 5 candies between 2 of his friends: one girl and one boy. Can you help him? First, place the children in center, then drag the candies to each of them!"), "totalBoys": 1, Index: src/activities/share/resource/board/board4.qml =================================================================== --- src/activities/share/resource/board/board4.qml +++ src/activities/share/resource/board/board4.qml @@ -23,7 +23,7 @@ */ QtObject { - property variant levels : [ + property var levels : [ { "instruction": qsTr("Charles wants to share his 8 candies with 3 of his friends: one boy and two girls. Can he split the candies equally?"), "totalBoys": 1, Index: src/activities/share/resource/board/board5.qml =================================================================== --- src/activities/share/resource/board/board5.qml +++ src/activities/share/resource/board/board5.qml @@ -24,7 +24,7 @@ */ QtObject { - property variant levels : [ + property var levels : [ { "instruction": qsTr("Bob wants to give 5 candies to his friends: two boys and one girl, his girlfriend already has one candy. Can you help him equally split the candies so that each friend will have the same amount of candies?"), "totalBoys": 2, Index: src/activities/share/resource/board/board6.qml =================================================================== --- src/activities/share/resource/board/board6.qml +++ src/activities/share/resource/board/board6.qml @@ -24,7 +24,7 @@ */ QtObject { - property variant levels : [ + property var levels : [ { "instruction": qsTr("Help Jon split 9 candies between three boys and two girls. The rest will remain to Jon."), "totalBoys": 3, Index: src/activities/share/resource/board/board7.qml =================================================================== --- src/activities/share/resource/board/board7.qml +++ src/activities/share/resource/board/board7.qml @@ -18,7 +18,7 @@ import QtQuick 2.6 QtObject { - property variant levels : [ + property var levels : [ { "maxBoys": 2, "maxGirls": 2, Index: src/activities/share/resource/board/board8.qml =================================================================== --- src/activities/share/resource/board/board8.qml +++ src/activities/share/resource/board/board8.qml @@ -18,7 +18,7 @@ import QtQuick 2.6 QtObject { - property variant levels : [ + property var levels : [ { "maxBoys": 3, "maxGirls": 3, Index: src/activities/share/resource/board/board9.qml =================================================================== --- src/activities/share/resource/board/board9.qml +++ src/activities/share/resource/board/board9.qml @@ -18,7 +18,7 @@ import QtQuick 2.6 QtObject { - property variant levels : [ + property var levels : [ { "maxBoys": 3, "maxGirls": 3, Index: src/activities/simplepaint/Simplepaint.qml =================================================================== --- src/activities/simplepaint/Simplepaint.qml +++ src/activities/simplepaint/Simplepaint.qml @@ -49,7 +49,7 @@ property alias background: background property alias bar: bar property alias paintModel: paintModel - property variant colors: bar.level < 10 ? Activity.colorsSimple : Activity.colorsAdvanced + property var colors: bar.level < 10 ? Activity.colorsSimple : Activity.colorsAdvanced property string colorSelector: colors[0] property string backgroundImg: Activity.backgrounds[bar.level - 1] } Index: src/activities/watercycle/Watercycle.qml =================================================================== --- src/activities/watercycle/Watercycle.qml +++ src/activities/watercycle/Watercycle.qml @@ -33,7 +33,7 @@ onStop: {} property string url: "qrc:/gcompris/src/activities/watercycle/resource/" - property variant barAtStart + property var barAtStart pageComponent: Item { id: background