From 9f2f4fe34fdf52fe227a108d9dd76db144f69799 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 22 Nov 2013 08:45:23 +0100 Subject: Fix QML file in wigglytext-example. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-33871 Change-Id: I0dcd1fa10d82b929161afb044867983675064247 Reviewed-by: Topi Reiniƶ --- examples/declarative/animation/behaviors/wigglytext/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/declarative/animation/behaviors/wigglytext/main.cpp b/examples/declarative/animation/behaviors/wigglytext/main.cpp index 92652c7c..b23d3a1f 100644 --- a/examples/declarative/animation/behaviors/wigglytext/main.cpp +++ b/examples/declarative/animation/behaviors/wigglytext/main.cpp @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) QmlApplicationViewer viewer; viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto); - viewer.setMainQmlFile(QLatin1String("qml/behaviours/behavior-example.qml")); + viewer.setMainQmlFile(QLatin1String("qml/wigglytext/wigglytext.qml")); viewer.showExpanded(); return app.exec(); -- cgit v1.2.3 From 190fd107ebf489783d9b673b97598da8febd48cc Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 25 Nov 2013 12:48:28 +0100 Subject: Bump MODULE_VERSION to 5.2.1 Change-Id: Ie118f79e690ba82f6bc6410c3e8158d57f710060 Reviewed-by: Matti Paaso Reviewed-by: Oswald Buddenhagen --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 4baafa83..457f68b5 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.2.0 +MODULE_VERSION = 5.2.1 -- cgit v1.2.3