aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Default: make PageIndicator use palettesJ-P Nurmi2017-09-224-9/+1
| | | | | | | | | | | | Task-number: QTBUG-63369 Change-Id: I545b267cb69b4fd76e42c17d436362ee4e06c45a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: make ProgressBar use palettesJ-P Nurmi2017-09-225-10/+4
| | | | | | | | | | | | Task-number: QTBUG-63369 Change-Id: Icf2204f9395798ccdca2448a26e0a2c9c4826a33 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: make BusyIndicator use palettesJ-P Nurmi2017-09-221-2/+2
| | | | | | | | | | | | Task-number: QTBUG-63369 Change-Id: If752fc3c29aa01993d3803364814c5a9962a3657 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Imagine: fix imagine style screenshotMitch Curtis2017-09-221-0/+0
| | | | | | | | | | | | | | It had some unrelated junk at the top. Change-Id: Ie6c394d3e8355e6117339d646e6384336b735bdc Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Imagine: add section to styles docMitch Curtis2017-09-222-0/+7
| | | | | | | | | | Change-Id: I5d8a68d44dcfd1e3ed92361cc4706557ae253e3a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Default: choose RoundButton foreground from the paletteJ-P Nurmi2017-09-221-8/+6
| | | | | | | | | | Change-Id: Ic596a7c237392e1a54591ac82b0b78ac806acf16 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: finish palette-support for TumblerJ-P Nurmi2017-09-221-1/+1
| | | | | | | | | | | | Task-number: QTBUG-63331 Change-Id: I5dbabc0c0a986761ce77b37c791e7a8fdd1034e2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: make ToolTip use palettesJ-P Nurmi2017-09-222-1/+8
| | | | | | | | | | | | Task-number: QTBUG-63331 Change-Id: I42232ab2dc270b5a68bcf967517b2a00d3aad666 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: pick selection & selected text color from the paletteJ-P Nurmi2017-09-228-15/+10
| | | | | | | | | | | | Task-number: QTBUG-63331 Change-Id: I14c2b05bbf7654b298a69cdc72fc4d8756a340d0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: palette-based Label.linkColorJ-P Nurmi2017-09-225-8/+3
| | | | | | | | | | | | Task-number: QTBUG-63331 Change-Id: Iad940e2260b96f81282779e5029a498895a2da44 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: choose Button foreground from the paletteJ-P Nurmi2017-09-222-6/+15
| | | | | | | | | | | | Task-number: QTBUG-63331 Change-Id: I413a1c0297ba4cd6040a6c2974b7eec352ca5857 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix tst_paletteJ-P Nurmi2017-09-221-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | The Default is being ported to use palettes. tst_palette starts failing as soon as QQuickDefaultTheme::palette() returns a custom palette, because the expected palette in tst_palette's comparison was the default platform palette, not the default style palette. First of all, the expected palette was constructed before any QtQuick Controls were imported. Secondly, it was not queried from the platform theme as appropriate. Change-Id: Ia28872fb2769c6cd5ff0159077769951def17f43 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: use palette.windowTextJ-P Nurmi2017-09-227-8/+10
| | | | | | | | | | | | | | | | | | Make use of the "windowText" color role for those controls that draw text against the window background. Task-number: QTBUG-63331 Change-Id: If4ea4176caf9dab79dd3a6997f3edbcaed7e789b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: use palette.textJ-P Nurmi2017-09-2212-18/+30
| | | | | | | | | | | | | | | | | | | | Make editors and delegates use the "text" color role from palettes. This color role is normally used as a foreground color for the "base" background color. Task-number: QTBUG-63331 Change-Id: Ic08463f54c1b04a4eccf791a576ae792f75bf89b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Imagine: fix MenuItem arrowMitch Curtis2017-09-2216-0/+0
| | | | | | | | | | | | | | | | | | | | | | It was white because menu previously had a dark background. The new assets have been optimized with: optipng -o7 -strip all *.png Change-Id: Ie59828612ae145b79f1e15d9f1f1db6a469b1020 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Update .gitignoreJ-P Nurmi2017-09-211-0/+1
| | | | | | | | | | Change-Id: Ifc195a5b9ca69223afe35b9ac332238e0c163e3d Reviewed-by: Liang Qi <liang.qi@qt.io>
* | QQuickApplicationWindow: reduce the amount of re-layoutingJ-P Nurmi2017-09-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 80f6b14 introduced a binding loop in testbench: qrc:/testbench.qml:263:13: QML TabBar: Binding loop detected for property "implicitWidth" This issue is best to fix in QQuickApplicationWindow, which is causing the loop by being way too eager to force-resize the TabBar in the middle of calculating its initial implicit size. Let it complete construction first. Change-Id: Ie3d8679efc73002af6c37f17c138b2f1e9668897 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Imagine: fix SpinBox assetsMitch Curtis2017-09-2180-0/+0
| | | | | | | | | | | | | | | | | | | | | | Some assets were not flipped correctly. The new assets have been optimized with: optipng -o7 -strip all spinbox*.png Change-Id: I411e89d5b000b0afd71421428f9754b3c6b13259 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2017-09-214-7/+12
|\| | | | | | | Change-Id: I237813241b35445d3372b84b0ef2759f3d2c5bcc
| * Default: improve TextField and TextArea stylingMitch Curtis2017-09-194-7/+12
| | | | | | | | | | | | | | | | | | | | - Remove top-level opacity assignments to allow full customization - Add more distinction between disable and placeholder text - Make disabled text more visible Task-number: QTBUG-62854 Change-Id: I2e8998fb739e4beda58978173173ca94a3759caf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: Maintain highlighted examples list locallyVenugopal Shivashankar2017-09-202-0/+36
| | | | | | | | | | | | | | | | | | | | Added more examples to the list. Task-number: QTBUG-60647 Change-Id: Ia63ffde2749fb85b8c4f2f8e06183863ce15726a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Imagine: fix QRC pathsMitch Curtis2017-09-1453-93/+272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Doc: ":/imagine" shouldn't be used in the same dir as the conf fileMitch Curtis2017-09-131-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Quoting JP: "To support qtquick designer, the style is allowed to be a folder relative to the location of the .conf. Location of the conf is ":/" and there's a folder called "imagine" which matches the name of the qqc2 style so it tries to use that as the style folder for the .qml files." Change-Id: I35d8bd4dadc62430bc70cd744e7084b1c0dba4bf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: add Imagine style screenshotMitch Curtis2017-09-121-0/+0
| | | | | | | | | | Change-Id: I7814182f7026f7d93f96a6166889e0d71bc67338 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: add "Asset Examples" section to Imagine docsMitch Curtis2017-09-122-1/+1887
| | | | | | | | | | | | | | | | This change adds a table of assets that designers can use as a reference when creating assets. Change-Id: I3de39889d14ccc87095d58a3582181349298fdcf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Imagine: clean up detailed descriptionMitch Curtis2017-09-121-7/+17
| | | | | | | | | | | | | | | | - Use the same format as the rest of the table. - Remove TODO, replace with section header Change-Id: Ic7ed6c4b5f297c3a5ac99bc17d1d6312690046b9 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | QQuickComboBox: fix attached Keys signal handlers when editableJ-P Nurmi2017-09-112-3/+5
| | | | | | | | | | | | Task-number: QTBUG-61135 Change-Id: I3f00cb81eeacbbddecc04d206bf13e602de15af7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Extend tst_paletteJ-P Nurmi2017-09-112-0/+123
| | | | | | | | | | | | | | | | | | | | The inheritance issue was first fixed for fonts in 5.9 (d3aef72) and then the merge commit (c32c776) fixed it for palettes too. This patch just adds the respective test case for palettes. Task-number: QTBUG-63119 Change-Id: I21d18f140878a72ee889d868c79b4694ab28431c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2017-09-1116-20/+289
|\| | | | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquicklabel.cpp src/quicktemplates2/qquicktextarea.cpp src/quicktemplates2/qquicktextfield.cpp Change-Id: Ibbf6bc48972f58fbc6779a87ac9e2434c56c4db8
| * Fix font inheritanceJ-P Nurmi2017-09-116-9/+135
| | | | | | | | | | | | | | | | | | | | In item views, it can happen during incubation that a control doesn't yet have a window associated when the parent item changes. Therefore we must make sure to resolve the font when the window changes. Task-number: QTBUG-63119 Change-Id: I890f70ae6faa232dcc2c094ccec02e76b371d2cb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fully qualify atan2 with the std namespaceJake Petroules2017-09-081-1/+1
| | | | | | | | | | | | | | | | This fixes the build on VxWorks Change-Id: I5ba3d182184151b62e3ed6c0ab5e4d77a0e66768 Reviewed-by: Tuomas Heimonen <tuomas.heimonen@qt.io> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
| * Fix non-modal drawer drag/swipe open and closeMichal Policht2017-09-063-1/+109
| | | | | | | | | | | | | | | | | | | | Function QQuickPopupPrivate::blockInput() has been overridden in QQuickDrawerPrivate to accept events that occur while mouse/touch is grabbed and events within drag area. Task-number: QTBUG-59652 Change-Id: Icf4129e702a351b266ea9c4544830185c315fc37 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Android: fix clang compilation with -qreal floatVyacheslav Koscheev2017-09-013-6/+6
| | | | | | | | | | Change-Id: Ica7a417aa1bb531bc63e3fa9dda0505a6e552b67 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * QQuickSpinBox: fix initial value validationJ-P Nurmi2017-08-292-2/+10
| | | | | | | | | | | | Task-number: QTBUG-62508 Change-Id: I8981968c02b65d4b005eb9b54b0228fd51a3abda Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix a crash with ScrollView + TextAreaJ-P Nurmi2017-08-293-1/+25
| | | | | | | | | | | | | | | | | | TextArea was not cleaning up its geometry change listener on the Flickable it was attached to. Task-number: QTBUG-62292 Change-Id: I31223d4fcf0b46235b18e8eb05bab686a32f5481 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update benchmarks for the new stylesJ-P Nurmi2017-09-114-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fusion was missing from tst_creationtime, and Imagine was missing from tst_objectcount. Furthermore, they were both missing from the list of dependencies declared in data/dependencies.qml, which is necessary in static builds and also expected to help with a random failure spotted in the CI logs: QWARN : tst_ObjectCount::qobjects(fusion/ApplicationWindow.qml) QQmlComponent: Component is not ready FAIL! : tst_ObjectCount::qobjects(fusion/ApplicationWindow.qml) 'object.data()' returned FALSE. (file:///C:/Users/qt/work/install/qml/QtQuick/Controls.2/Fusion/ApplicationWindow.qml:40 module "QtQuick.Controls.Fusion" version 2.3 is not installed) tst_objectcount.cpp(141) : failure location Change-Id: Ibb85b3024f1bb9d1e2a9654aeba39adb378fdec6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: Edit languagev5.10.0-alpha1Venugopal Shivashankar2017-09-073-37/+36
| | | | | | | | | | | | | | | | | | - Fixed pucntuation issues and typos - Removed redundant text Task-number: QTBUG-60647 Change-Id: I1ab0e8e62a2e3f4997629653b659f130c13db007 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | benchmarks: avoid "Empty filename passed to function" warningsJ-P Nurmi2017-09-072-6/+12
| | | | | | | | | | | | | | | | Add isEmpty() checks to avoid annoying warnings from QFileSystemEngine for Unix. Change-Id: I20b4f07605692271468dfc26b3c968406323de98 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | tst_creationtime: exclude ApplicationWindowJ-P Nurmi2017-09-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Creating huge amounts of Q(Quick)Window instances puts an unreasonable stress on the system and we start facing issues such as that OpenGL context creation starts failing and things explode: qt.scenegraph.renderloop QSGGuiThreadRenderLoop::windowDestroyed - cleanup without an OpenGL context Change-Id: Iaf4725633af5def7fbb2df1f12ff61e4b543e5e2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: add explicit importsJ-P Nurmi2017-09-062-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | To avoid problematic implicit imports: ASSERT failure in QQmlImportDatabase::importDynamicPlugin: "Internal error: Plugin imported previously with different uri", file qqmlimport.cpp, line 2072 Task-number: QTBUG-63037 Change-Id: I099bd88c6350853d3f0f525a7d9b8823f1f28f86 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Register new base class revisionsJ-P Nurmi2017-09-061-0/+5
| | | | | | | | | | | | | | | | QQuickText & QQuickTextEdit have gained new properties in QtQuick 2.10. Make them available in QQuickLabel and QQuickTextArea, respectively. Change-Id: I5156b683efeedd24b23c18d1c2e2509d3040b647 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Bump QtQuick 2.9 imports to 2.10Mitch Curtis2017-09-06327-328/+328
| | | | | | | | | | Change-Id: I274146911cd8a204fcbf439da9259b0a38c8092e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: move qtquickcontrols2-applicationwindow-wireframe.pngJ-P Nurmi2017-09-042-0/+0
| | | | | | | | | | | | | | | | d375a74 accidentally placed the image to a wrong place. Move it together with the other doc files. Change-Id: Ibdc35c8fad25ee4a8da4875c6e1ce494cfd3a570 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.10' into dev" into ↵J-P Nurmi2017-09-0113-55/+109
|\ \ | | | | | | | | | refs/staging/dev
| * \ Merge remote-tracking branch 'origin/5.10' into devJ-P Nurmi2017-09-0113-55/+109
| |\ \ | | | | | | | | | | | | Change-Id: I581d64b0c3fbf98750756c9386c6166051834252
| | * | QQuickTabBar: optimize layoutingJ-P Nurmi2017-09-011-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickTabBarPrivate::updateLayout() was being called quite many times during the creation. This patch reduces the amount of calls significantly and gives a little boost in qmlbench too (~133 => ~140). Change-Id: I6f8b31919cdc1a5e6cf4d133c5e55e400f3f8c26 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | Make use of QQuickItem::ItemEnabledHasChangedJ-P Nurmi2017-08-314-31/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was added in qtdeclarative commit 286f14f1. Getting rid of the slow QObject::connect() gives a little boost of 1~2 frames in qmlbench. Change-Id: If027fe2bee9eedad572afe8828b302c2f44cffac Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | Fix accessibility-related performance regressionsJ-P Nurmi2017-08-316-11/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before 089dd16f, we had a QQuickControlPrivate::accessibleAttached member that indicated whether accessibility was active. Since 4be38ab in qtdeclarative, it was possible to access QQuickAccessibleAttached:: attachedProperties() directly, but we ended up accidentally accessing it even when accessibility was not active, which added noticeable overhead. This improves those qmlbench test cases that call accessibility-aware setters such as QQuickAbstractButton::setChecked() a lot. For example, the test cases for CheckBox and RadioButton create large amounts of controls with a "checked: index % 2" binding. - CheckBox: 84 => 93 frames - RadioButton: 98 => 113 frames QAccessible::setActive(true) only notifies the observers, but does not really make accessibility active in the sense that the consequent calls to QAccessible::isActive() still return false. tst_accessible had to be changed to use QPlatformAccessible::setActive() instead. Change-Id: I8fd0fe2dddfd5633ce22a080bcda459f2d6e443e Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | ColorImage: colorize only if neededJ-P Nurmi2017-08-306-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickColorImageProvider got replaced by QQuickColorImage in 9fc3659. This seems to have introduced a performance regression in several controls that are now colorizing images even when there's no need to. Various indicator images have the correct default color that matches the normal state. They need to be colorized only when gaining focus or being disabled, for example. The improvement in qmlbench results: - CheckBox: 70 => 84 frames - ComboBox: 88 => 92 frames - Dial: 73 => 77 frames - MenuItem: 73 => 84 frames Change-Id: I9155042542f5069cff201a1730b9dd2a62cffd67 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | tst_combobox: remove bogus mouse highlight checksJ-P Nurmi2017-09-011-12/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ComboBox gained mouse hover support in Qt 5.9. The highlighted() signal is now emitted during the test, because 4c46dce8f in qtdeclarative made QuickTest use QTest::mouseXxx(), which in turn calls the window system interface to deliver mouse events, and consequently, items in the combo box receive hover events. Before, QuickTest was sending mouse events directly, so there were no hover events involved. There is a separate test_mouseHighlight() function for the mouse highlighting functionality, so these tests can be simply removed. Task-number: QTBUG-62926 Change-Id: I7e5e0df993a9c2f78bae641bdfa9189f3cd0cc67 Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>