aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
Commit message (Collapse)AuthorAgeFilesLines
* Rename tst_scrollbar to tst_cursorJ-P Nurmi2017-04-051-0/+1
| | | | | | | | | | | This test was added in 88a62b3 that fixed the scrollbar cursor. It was not possible to test in QML, so a separate C++ test was added. It was noticed that most interactive controls have the exact same issue, so we want to utilize the same test for testing the cursors of all relevant controls. Change-Id: I7c307de9f72760b0993007246beb3357a1b5ec2b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add Wearable demoShrikant Dhumal2017-03-131-0/+1
| | | | | Change-Id: I3e287b85517c04803964c068e32bf8b6bcae5cb6 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Make styles configurable featuresJ-P Nurmi2017-02-061-0/+3
| | | | | | | | | | | | | | | ./configure [...] Qt Quick Controls 2: Styles ................................. Default Material Universal Supports both syntaxes: -(no-)style-[material|universal] -(no-)feature-quickcontrols2-[material|universal] Change-Id: I011cc38e5752d2c718376ca7493940271920b3e1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add "hover support" configure featureJ-P Nurmi2017-02-061-0/+4
| | | | | | | | | | ./configure -no-feature-quicktemplates2-hover [...] Qt Quick Templates 2: Hover support .......................... no Change-Id: I0509a1a9ac3ffe2cbfe4f2016ce0345708860b84 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2017-01-051-0/+1
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/quickcontrols2/quickcontrols2.pro Change-Id: If2f5e40487ba6515ba322f92380573727bdd6bc0
| * Flat Style exampleThomas Hartmann2017-01-051-0/+1
| | | | | | | | | | | | | | | | | | This example shows how to integrate custom styled components with tooling. The example uses states in the styling items, so they can be easily edited and checked in the designer. Change-Id: Ie665bb3938cdb1b135dbbd4163e1b901e61a6be0 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add "Swipe to Remove" exampleJ-P Nurmi2016-12-201-0/+1
| | | | | | | | | | Change-Id: Ibab960ddd073ddcdfbf2b6e4492882662c7021b5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Side Panel exampleJ-P Nurmi2016-12-011-0/+1
|/ | | | | | Task-number: QTBUG-53169 Change-Id: I1d84d2fc9cbfce0fa71703f469bb6d5030e41d67 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update .gitignoreJ-P Nurmi2016-11-171-0/+1
| | | | | Change-Id: Ib6ebd0d076309f2d22368223bb323547aed33f3a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-10-071-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-disabled.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-normal.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-checked.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-disabled.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-focused.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-normal.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-disabled.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-first-handle-focused.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-normal.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle-focused.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-disabled.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-focused.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-normal.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar-explicit.qml src/quicktemplates2/qquickmenu.cpp tests/auto/controls/data/tst_buttongroup.qml tests/auto/controls/data/tst_swipedelegate.qml Change-Id: Ib6042a0ad716f557927e7412d17ea8957d06c015
| * Add screenshots manual test for taking screenshots of snippetsMitch Curtis2016-10-041-0/+1
| | | | | | | | | | | | | | | | | | This can be used to take screenshots of items loaded from snippets, without the window frame being included as would be the case if using e.g. qmlscene. Change-Id: I376148a66a26be846c102e768ffade204cea448b Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-09-141-0/+1
|\| | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquicktextarea_p_p.h src/quicktemplates2/qquicktextfield_p_p.h Change-Id: Ie7b4a114ad27a4cad337c91e8ebcf696b0e845d7
| * Update .gitignoreJ-P Nurmi2016-09-131-0/+1
| | | | | | | | | | Change-Id: Ibdad75be0d08c7e737af3a2ba6c096b3a9a2186f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Update .gitignoreJ-P Nurmi2016-09-021-0/+2
| | | | | | | | | | Change-Id: Ie23caad334346a87703655fd83c447447bbfbce0 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Update .gitignoreJ-P Nurmi2016-08-241-0/+4
| | | | | | | | | | Change-Id: Ic9b8866cb353a14bbcc9005ef7a419fe1629dc34 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Restore version 2.0 for the .impl importsJ-P Nurmi2016-08-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | It's a bit of extra hassle, but the type registration can be done so that we keep the old version available to avoid deliberately breaking apps that have had to import .impl to gain access to the internal goodies. For example, someone may have made a copy of one of the controls as our documentation suggests. :) Change-Id: I5308d7e74ecebf69da7fe9c6912380f72c3c9a2b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add .qmlc (QML cache) files to .gitignoreJ-P Nurmi2016-08-091-0/+1
| | | | | | | | | | Change-Id: Ie451be17e785dc8551304dcfb0b2c8552023bdba Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add manual test app for buttonsJ-P Nurmi2016-07-201-0/+1
| | | | | | | | | | | | | | | | Buttons have so many different states that it's useful have a test app that can be used to visualize various states in different themes. Change-Id: Ia714c1d769aa13529c3117852b0d9b625a50d7d0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Setup a Qt.labs.platform moduleJ-P Nurmi2016-06-161-0/+1
|/ | | | | | | | | This change just prepares the infrastructure and imports an icon loader helper that will be used for the platform menu, dialog, and system tray icon implementations. Change-Id: I34a93050a7c988134c3daa986aca6021eac7a4d1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Replace tst_styles with tst_material & tst_universalJ-P Nurmi2016-06-141-1/+3
| | | | | | | | | | The CI was not able to catch failures in tst_styles, because the test results were output by separate child processes. This change builds three different versions of tst_controls, which each run with the appropriate style. Change-Id: I95b2bdd90221579a3176e827802236d80d9f1a09 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Rename tst_material and tst_universalJ-P Nurmi2016-06-131-2/+2
| | | | | | | | | | These test specificly the QQuickMaterialStyle and QQuickUniversalStyle implementations, so rename appropriately to make room for the upcoming tst_material and tst_universal tests. See the next commit for more details about that. Change-Id: I08d6116d6219084f6087682b7e712f8499a0e945 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add a simple manual test for taking screenshots in style docsJ-P Nurmi2016-05-271-0/+1
| | | | | Change-Id: Ib5a985796d56b66c5842f2e1ab0e460420f62b54 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickStyleSelector: fix relative path handlingJ-P Nurmi2016-04-251-0/+1
| | | | | | | | | | | | This makes it possible to pass a relative path to the style: ./myapp -style relative/path/to/my/style To make the tests pass, includes a fix to avoid double slashes in selected URLs. Change-Id: I1b366eb7793523dd0f1058236661cedaa1216f3d Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Implement case-insensitive style name lookupJ-P Nurmi2016-04-231-0/+1
| | | | | | | | Fixes the issue that "./app -style material" did no longer work, but the case had to match exactly (./app -style Material). Change-Id: I446654110af670c391f8e304ce8008fbd6e9acaa Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Fix QQuickDrawerPrivate::positionAt()J-P Nurmi2016-04-211-0/+1
| | | | | | | | The position on the right and bottom edges is relative to the size of the window, not the drawer itself. Change-Id: Ia1d7418d4091a3a9e26f691bd75448023e0ca1cf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update .gitignoreJ-P Nurmi2016-04-211-6/+6
| | | | | Change-Id: Iaca71ec9a4281353bca0d7227f9c4e08ac5a4477 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update .gitignoreJ-P Nurmi2016-03-221-1/+1
| | | | | Change-Id: Ib209b03133309069d7bef5df77acf7b50e0e9698 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Turn libQtLabsControls to a public C++ libraryJ-P Nurmi2016-03-161-1/+2
| | | | | | Change-Id: Ia4365ff05d59920143d6288b47c383a202eba772 Task-number: QTBUG-50787 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Update .gitignoreJ-P Nurmi2016-03-021-0/+5
| | | | | Change-Id: I056acffe44031cfae7b3a4080860b58a15a3a805 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-02-071-0/+9
|\ | | | | | | | | | | | | Conflicts: src/imports/controls/universal/ToolButton.qml Change-Id: Ib9f1e7d83fb824d9e6a13a2bc429d1a5642fe4f6
| * Update .gitignoreJ-P Nurmi2016-02-021-0/+9
| | | | | | | | | | Change-Id: Iff06544f14964e442b66901d5c23254786008293 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-281-0/+1
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/material/qtlabsmaterialstyleplugin.cpp src/templates/qquickapplicationwindow_p.h src/templates/qquickcombobox.cpp src/templates/qquickcombobox_p.h src/templates/qquickpopup.cpp Change-Id: Ibd87e907bc8abf1f675147761ea8bb0b40722478
| * Add Popup::closePolicyJ-P Nurmi2016-01-281-0/+1
| | | | | | | | | | Change-Id: Ie3d0f50a59aeaab36ec388af897cbf2596269ce3 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-251-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/templates/qquickcombobox_p.h src/templates/qquickmenu_p.h src/templates/qquickmenu_p_p.h src/templates/qquickoverlay_p.h src/templates/qquickpopup.cpp src/templates/qquickpopup_p.h src/templates/qquickstackview_p.cpp Change-Id: I89c7d518697beec0b81ef3a12205286a4f3ccf89
| * Update .gitignoreJ-P Nurmi2016-01-221-0/+2
| | | | | | | | | | Change-Id: Ib223ea2ef258fdc7812ed2daf329263e12292a52 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-191-0/+1
|\| | | | | | | | | | | | | Conflicts: src/controls/qquickstyle.cpp Change-Id: I1c8273012b01726072e5cbfd4369453a780ff03e
| * Update .gitignoreJ-P Nurmi2016-01-141-0/+1
| | | | | | | | | | Change-Id: I763c889f675be2de199a3bd88fff0472318a831d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Support static buildsJ-P Nurmi2016-01-131-0/+2
|/ | | | | Change-Id: I17bb9131603da912597777b2ec0b9be3894ed858 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add Gallery exampleJ-P Nurmi2015-12-171-0/+2
| | | | | | Task-number: QTBUG-49941 Change-Id: I7bd6b25e12a6e90ba637231790b9a2c7a92bb821 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Update .gitignoreJ-P Nurmi2015-12-051-0/+1
| | | | | Change-Id: Ia724edb5ab73bd7369141902a82fd15aecc0a87b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add tst_materialJ-P Nurmi2015-11-301-0/+1
| | | | | | | | | Tests that the inheritance of theme & accent works as expected. This is useful for avoiding regressions in the process of introducing a shared base class for QQuickMaterialStyle and QQuickUniversalStyle. Change-Id: Ib2eb5922323131fb531344b80dc928a0a07cca90 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Cleanup .gitignoreJ-P Nurmi2015-11-271-7/+0
| | | | | Change-Id: Ibd2a4b51e99e9e6cebfee94c7cd734453b56e25f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Remove pop-o-rama manual testMitch Curtis2015-11-271-1/+0
| | | | | | | | We will be working on new examples in cooperation with designers that we can use to manually test and demonstrate popup usage with. Change-Id: Ib3b2ffaa66f99698e1f27bec3ba0610da32bdd85 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update .gitignoreJ-P Nurmi2015-11-201-0/+2
| | | | | Change-Id: Id762bddf87d7b3eb095d5d262b03349f9d370e27 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add tst_stylesJ-P Nurmi2015-11-121-0/+1
| | | | | | | Re-runs tst_controls with all styles Change-Id: I1feda621bfd5f48f42742b1f297abd11c6b437a9 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add Universal styleJ-P Nurmi2015-11-121-0/+1
| | | | | | | https://dev.windows.com/design Change-Id: I1d8c633ae246724649a6ed71b300a56ba9572405 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add Material styleMitch Curtis2015-11-121-0/+1
| | | | | Change-Id: I93662a53b42858a5b65154c5ede334182e738dde Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Refactor press and hold testsJ-P Nurmi2015-11-121-0/+1
| | | | | | | | | | | | | | | | | We can't rely on timers in auto tests. They are not fired accurately under heavy CPU load => random CI failures. This change make the press and hold tests independent of timeouts. The idea in a nutshell: the test creates two control instances, and sends press events to both of them. Both controls run their timers and emit pressAndHold() - unless canceled. The test waits as long as it takes for the second control to emit pressAndHold(). At that point we can reliably assume that the first control would have already emitted the signal, if it was not canceled as appropriate. Change-Id: I96aaf4d204db368171209271a4a0fa2ff15cc323 Task-number: QTBUG-47963 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Update .gitignoreJ-P Nurmi2015-10-301-1/+1
| | | | | Change-Id: I1de126dd2341f77b00b27695b57665bcbd8e0887 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add tst_gifs to .gitignoreJ-P Nurmi2015-10-091-0/+1
| | | | | Change-Id: I0f2c0174527c5e8497b83a74c246923e7b3c4186 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>