diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-08-26 09:51:49 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-08-26 11:21:16 +0200 |
| commit | e525c551394ba2827e4494bfb72ff43171e9b7e1 (patch) | |
| tree | a7223403990a45bbaf8037600f282c1d01a6e811 /examples | |
| parent | 1075dca1b50926f52daddf099b5f5a9fbb5da6c7 (diff) | |
| parent | e9e6f70d355499d551a26960d236644f92ea38af (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
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 |