From: Gunnar Sletta <gunnar.sletta@digia.com>
Date: Thu, 17 Jan 2013 21:08:56 +0000 (+0100)
Subject: Merge branch 'stable' into dev
X-Git-Tag: upstream/5.2.1~944
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c54d0ef8f6442e32d5762edccef46db80b68681;p=platform%2Fupstream%2Fqtdeclarative.git

Merge branch 'stable' into dev

Conflicts:
	src/qml/doc/qtqml.qdocconf
	src/quick/doc/qtquick.qdocconf

Change-Id: I087fa14720995a5e53c43567dc4a3c29eb9992a9
---

9c54d0ef8f6442e32d5762edccef46db80b68681
diff --cc tools/qmlscene/main.cpp
index 1121f02,a9a907f..090d173
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@@ -347,11 -345,11 +347,11 @@@ static void usage(
  {
      qWarning("Usage: qmlscene [options] <filename>");
      qWarning(" ");
-     qWarning(" options:");
-     qWarning("  --maximized ............................... run maximized");
-     qWarning("  --fullscreen .............................. run fullscreen");
+     qWarning(" Options:");
+     qWarning("  --maximized ............................... Run maximized");
+     qWarning("  --fullscreen .............................. Run fullscreen");
      qWarning("  --transparent ............................. Make the window transparent");
 -    qWarning("  --no-multisample .......................... Disable multisampling (anti-aliasing)");
 +    qWarning("  --multisample ............................. Enable multisampling (OpenGL anti-aliasing)");
      qWarning("  --no-version-detection .................... Do not try to detect the version of the .qml file");
      qWarning("  --slow-animations ......................... Run all animations in slow motion");
      qWarning("  --resize-to-root .......................... Resize the window to the size of the root item");