diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-08-26 09:43:33 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-08-26 09:51:56 +0200 |
commit | e9e6f70d355499d551a26960d236644f92ea38af (patch) | |
tree | 542840d4b3b8ff82d6fab38c9ad2615d3592b793 /examples | |
parent | 916ced089f37d96ca8ef1cdb938791247bd44b72 (diff) | |
parent | eadc35f499edd25d5d1c5f803db1d61675c1cc2c (diff) |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/qml/qml/qqmlobjectcreator_p.h
Change-Id: I60858ddb46866a8fa1a8576bb05b412afeeb4e41
Diffstat (limited to 'examples')
-rw-r--r-- | examples/quick/demos/calqlatr/calqlatr.qml | 1 | ||||
-rw-r--r-- | examples/quick/demos/samegame/samegame.pro | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/examples/quick/demos/calqlatr/calqlatr.qml b/examples/quick/demos/calqlatr/calqlatr.qml index 0a092c25da..5f0ebe85a8 100644 --- a/examples/quick/demos/calqlatr/calqlatr.qml +++ b/examples/quick/demos/calqlatr/calqlatr.qml @@ -51,6 +51,7 @@ Rectangle { color: "#272822" onWidthChanged: controller.reload() + onHeightChanged: controller.reload() function operatorPressed(operator) { CalcEngine.operatorPressed(operator) } function digitPressed(digit) { CalcEngine.digitPressed(digit) } diff --git a/examples/quick/demos/samegame/samegame.pro b/examples/quick/demos/samegame/samegame.pro index b9b316871c..51e6f00321 100644 --- a/examples/quick/demos/samegame/samegame.pro +++ b/examples/quick/demos/samegame/samegame.pro @@ -1,6 +1,6 @@ TEMPLATE = app -QT += qml quick +QT += qml quick sql SOURCES += main.cpp RESOURCES += samegame.qrc |