Commit f0339052 authored by Bruno Coudoin's avatar Bruno Coudoin
Browse files

normalized imports.

Now all import are QtQuick 2.2, QtQuick.Controls 1.2, QtQuick.Window 2.2

I found out that adding a ComboBox was crashing GCompris. Could
not reproduce on a simple independant program so did not made a
Qt bug report..
parent d0032c4c
import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick 2.2
import QtQuick.Controls 1.2
import "qrc:/gcompris/src/core"
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.2
import QtMultimedia 5.0
import "planegame.js" as Activity
import "qrc:/gcompris/src/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.2
import "planegame.js" as Activity
import GCompris 1.0
......
......@@ -18,7 +18,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.2
import QtMultimedia 5.0
import GCompris 1.0
......
import QtQuick 2.0
import QtQuick 2.2
Planegame {
......
......@@ -21,7 +21,7 @@
*/
.pragma library
.import QtQuick 2.0 as Quick
.import QtQuick 2.2 as Quick
.import GCompris 1.0 as GCompris //for ApplicationInfo
var max_velocity = 500 * GCompris.ApplicationInfo.ratio
......
......@@ -18,8 +18,8 @@
* 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.Controls 1.0
import QtQuick 2.2
import QtQuick.Controls 1.2
import GCompris 1.0
Item {
......
......@@ -20,7 +20,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.1
import QtQuick 2.2
import GCompris 1.0
Image {
......
......@@ -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.2
import GCompris 1.0
Item {
......
......@@ -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.2
import GCompris 1.0
Image {
......
......@@ -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.2
Item {
property int value: 0
......
......@@ -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.2
import GCompris 1.0
Image {
......
......@@ -19,7 +19,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls 1.2
import GCompris 1.0
Rectangle {
......
......@@ -19,7 +19,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls 1.2
import GCompris 1.0
DialogBackground {
......
......@@ -18,8 +18,8 @@
* 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.Controls 1.0
import QtQuick 2.2
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.0
ButtonStyle {
......
......@@ -18,8 +18,8 @@
* 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.Controls 1.0
import QtQuick 2.2
import QtQuick.Controls 1.2
import GCompris 1.0
Item {
......
......@@ -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.2
import GCompris 1.0
Rectangle {
......
......@@ -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.2
import GCompris 1.0
Rectangle {
......
......@@ -18,9 +18,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.Controls 1.0
import QtQuick.Window 2.1
import QtQuick 2.2
import QtQuick.Controls 1.2
import QtQuick.Window 2.2
import QtMultimedia 5.0
import GCompris 1.0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment