diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:05:06 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:05:06 +0100 |
| commit | 7e9b0f8e55cbdfc780a28b054ac2ad66a630e312 (patch) | |
| tree | 2cbf9d330d7d86df65205aa48fbac9dcd62c5383 | |
| parent | 2b5ea944b1d2f717dd74f6524cd0adc9077425de (diff) | |
| parent | 190fd107ebf489783d9b673b97598da8febd48cc (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: Ia89f74de1281f7357cfa75b22b6d43e83b032ab2
| -rw-r--r-- | examples/declarative/animation/behaviors/wigglytext/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |