aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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>
* Fix crash in theme code when loading engines in successionJ-P Nurmi2015-10-091-0/+1
| | | | | | | | | | | | Store global engine specific themes as dynamic properties on the engines themselves. This avoids the problem that storing engines and their themes to a hash map had that destroyed engines and themes were not cleaned up from the hash map. Change-Id: I7330995339c263d456f74d33f6535d5ac7d9d5d4 Task-number: QTBUG-48651 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Rename QtQuick.Controls 2.0 to Qt.labs.controls 1.0J-P Nurmi2015-10-011-4/+4
| | | | | Change-Id: I142622dd85e95ef70b11132e77ccf48701f2cabc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename QtQuick.Templates 2.0 to Qt.labs.templates 1.0J-P Nurmi2015-10-011-1/+1
| | | | | | Change-Id: I3263a600065dfa2bfe7334ec44a74e2dca83aa36 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename QtQuick.Calendar 2.0 to Qt.labs.calendar 1.0J-P Nurmi2015-10-011-1/+1
| | | | | Change-Id: Ief7e28f6c595cb60f15a4960dada24a6c2f5ca3e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Fix QQuickDayOfWeekModel::setLocale()J-P Nurmi2015-09-241-0/+1
| | | | | | | | It must emit dataChanged() even if the first day of week of the new and old locales are the same. The names are most likely different. Change-Id: I932215821962910ef1fb8a66f2dab81dcc51a3b1 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Update .gitignoreJ-P Nurmi2015-09-191-0/+1
| | | | | Change-Id: Idb66ae1aba88c7d8ee4077d4e5e2750a05c13bac Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Merge Qt Quick Extras into Qt Quick ControlsMitch Curtis2015-09-181-2/+1
| | | | | | | | | | | | The original split existed because the public and enterprise controls were developed separately. Now that all controls are public and developed together, the split no longer makes sense and is difficult for users to understand. Change-Id: I00420f4d09f8c837232231d03fe818b7b3403fab Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update .gitignoreJ-P Nurmi2015-09-181-0/+1
| | | | | Change-Id: Ia8b12afe818f1806d3c258fa97b1a37de7c23b14 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update .gitignoreJ-P Nurmi2015-09-141-0/+1
| | | | | Change-Id: I948abfd5c7b2b34a176e669b2475f92e90475804 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* .gitignore: add tst_applicationwindowJ-P Nurmi2015-08-271-0/+1
| | | | | Change-Id: Id1924e002fd1954cf4f594bdac53101cb3f94ebd Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add tst_snippetsJ-P Nurmi2015-06-271-0/+2
| | | | | | | | | | | | | | | This is going to include all snippets used in the documentation, which will be then automatically tested for vality, and at the same time the respective screenshots are automatically generated. Notice that copying the screenshots over to src/doc/images is still a manual step. This is fully intentional because the screenshot results may vary quite a bit across different platforms due to different fonts and so on. FWIW, my personal favorite for generating the screenshots is OS X. Change-Id: I72b299f15b498abc1afd0a686c56d43159bee775 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Auto test anchors & attached objectsJ-P Nurmi2015-06-141-1/+1
| | | | | | | | | | | | | | | | | | | Rename the former tst_declarative to tst_sanity and extend it with tests to prevent: a) use of anchors, and b) multiple attached object instances of the same type. Anchors are not allowed for two reasons: - performance (QQuickAnchors is a QObject), and - to let users relayout delegates (x/y/width/height bindings can be overridden, anchors not so easily) Multiple attached object instances (eg. Theme) can easily happen by accident. "Theme.fooColor" can be used in the control root, but in all delegate items, "control.Theme.fooColor" must be used instead. Change-Id: I4045d5bd717fa21db79d1c3bd618fc450e292fa4 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Move the drawer example under extrasJ-P Nurmi2015-06-111-1/+1
| | | | | Change-Id: I61827e005c9c7a047e181c8f23baac9a09a865ee Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Auto test 100% declarative QML layerJ-P Nurmi2015-06-111-0/+1
| | | | | | | | | | Not allowed: - .js files - signal handlers - function declarations Change-Id: I31247f154b96718ca95835120c9e7326e3c97968 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update .gitignoreJ-P Nurmi2015-06-061-0/+2
| | | | | Change-Id: I71df0935e69690775a58e868694632be9fbd7f78 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update .gitignoreJ-P Nurmi2015-05-151-0/+4
| | | | | | | | Ignore non-developer build artifacts and intermediate files to make 'git status' more pleasant to read. Change-Id: Ie587bc31bcaf673db7c33251e92661ac1e5417b0 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update .gitignoreJ-P Nurmi2015-04-201-0/+1
| | | | | Change-Id: I7abcadf4aa6432a59f831ba4321a5bba0b9c49fe Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename benchmarksJ-P Nurmi2015-04-091-2/+2
| | | | | | | | Just to make it clear what they actually do. These project names are also visible in Qt Creator when choosing the run-target... Change-Id: I95dd54fd1b6cb3369ab19dbaccbd92d104ea5250 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename Style to ThemeJ-P Nurmi2015-04-081-1/+1
| | | | | Change-Id: I0186cd36f0b42ca015b70a09af27f8a3517d4a60 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Rename tests/benchmark -> tests/benchmarksJ-P Nurmi2015-03-181-2/+2
| | | | | Change-Id: I1ffd60772ca4a504d174c3ad4e321bf3c3fb5849 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Add benchmark for the amount of created items & objectsJ-P Nurmi2015-02-091-0/+1
| | | | | Change-Id: I42328f7129051455150dfb0c77410e72f6ea4ed5 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Import the Qt Quick Controls 2 prototypeJ-P Nurmi2015-02-051-0/+76
Change-Id: Ib8c0c4160958e5cfea29a6e9df1b3f1fb19715fc Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>