summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-10-27 09:54:43 +0200
committerLiang Qi <liang.qi@qt.io>2016-10-27 09:56:20 +0200
commit6b58ce5251045fb751eb511b2cb3571bcd113f28 (patch)
tree7d3b63836c7ec0cce618ce4180c9f5ed63900a6a /examples
parent93d7c26653757755ae65f14d06d6df6f9ec2fc07 (diff)
parentc849f3a7eff55d60c4010831ec67336c5c0f2a27 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts: src/quick/items/qquickwindow.cpp tests/auto/quick/qquicktext/BLACKLIST tests/auto/quick/qquicktextedit/BLACKLIST Change-Id: I8bd68b0b5e853b7908791d2cbddd18dd527c76ae
Diffstat (limited to 'examples')
-rw-r--r--examples/quick/demos/tweetsearch/content/LineInput.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/quick/demos/tweetsearch/content/LineInput.qml b/examples/quick/demos/tweetsearch/content/LineInput.qml
index 7e4ffda92b..46bc73f3af 100644
--- a/examples/quick/demos/tweetsearch/content/LineInput.qml
+++ b/examples/quick/demos/tweetsearch/content/LineInput.qml
@@ -62,7 +62,7 @@ FocusScope {
text: "Enter word"
font.pixelSize: 18
color: "#707070"
- opacity: input.length ? 0 : 1
+ opacity: input.displayText.length ? 0 : 1
}
Text {