Commit Graph

6 Commits

Author SHA1 Message Date
Eike Ziller
a98fe15fe5 Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
	qbs/pluginspec/pluginspec.qbs

Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9
2013-07-08 15:01:17 +02:00
Marco Bubke
90ce3aec8b QmlDesigner: Test mode for qml puppet streams
Change-Id: I93128c60892900d6b4728569b84efb0ed835b51f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-08 11:28:38 +02:00
Thomas Hartmann
f6303e6784 QmlDesigner.QmlPupppet: Keeping the puppet from stealing focus on Mac
Defining QT_MAC_DISABLE_FOREGROUND_APPLICATION_TRANSFORM keeps the puppet
from stealing the focus of Qt Creator on Mac OS X and Qt 5.

Task-number: QTCREATORBUG-9418
Change-Id: Id0193b95d4c788ebe243773458645d1c584b2044
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-04 13:02:06 +02:00
Marco Bubke
7784baf54f QmlDesigner: Make it easier to add new arguments to the puppet
Change-Id: I15bc4a1a431787e350ace9fa09d8c140d06a7ed6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-04 14:37:28 +02:00
Gunnar Sletta
b91a5bcb13 Force gray-antialiasing for text.
Subpixel antialiasing cannot be supported when rendering is done
to a transparent-cleared FBO.

Change-Id: I46eeac792416f6164521c9142a8b6cffbbddc99b
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-06-04 12:41:33 +02:00
Marco Bubke
333cec5957 QmlDesigner: Change main.cpp in qmlpuppetmain.cpp
To better find it in the qt creator locator.

Change-Id: Icfc7b400ee972802471a7a52f8552bb0fd41acdb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-04 12:41:00 +02:00