qt/qtquickcontrols2.git - Qt Quick Controls 2

	Commit message (Collapse)	Author	Age	Files	Lines
*	Respect user font settings from qtquickcontrols2.conf file	Mitch Curtis	2018-01-03	2	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \|	Resolve the style's font against the font that the user set in the configuration file, rather than only using the style's font. This patch also removes all of the fonts which were identical and replaces them with a single font. Task-number: QTBUG-65500 Change-Id: I284b0d75ac3ad5bf7123bbd13bbfe85d25145483 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
*	Imagine: fix QRC paths	Mitch Curtis	2017-09-14	5	-0/+153
	Using ApplicationWindow as an example, its NinePatchImage url is assigned like so: source: Imagine.path + "applicationwindow-background" If Imagine.path is set to ":/images" by the user, then the final URL would be: QUrl("file:///home/user/qt/qtbase/qml/QtQuick/Controls.2/Imagine/:/images/applicationwindow-background") We could use a QUrl for QQuickImagineStyle::path, but we don't want to support anything other than local paths. Instead, we add a private "url" property that returns a URL that we construct correctly in C++ ourselves, and then the Imagine QML controls files use that property. Change-Id: Ic4d1910bbc7f7b6f80f257496ae6131777a19401 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>