aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/applicationwindow
Commit message (Collapse)AuthorAgeFilesLines
* Add ApplicationWindow::menuBarJ-P Nurmi2017-08-312-1/+15
| | | | | | | A follow-up commit to 66faa149. Change-Id: I94c92752d54ae0ca4878da72915b3d83461a4124 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-07-112-4/+55
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf tests/auto/controls/data/tst_scrollindicator.qml Change-Id: I1f5581ae7814c0d4152e4c9b79a30a8af5a3a17b
| * Fix focus handling for popupsJ-P Nurmi2017-07-112-4/+55
| | | | | | | | | | | | | | | | | | | | | | | | When a popup is closed, if there are multiple popups open, restore focus to the next popup in chain instead of transferring focus to the window content. This allows us to cleanup the custom focus handling for sub-menus in dev. There is no more need to manually transfer focus to the parent menu or to a sub-menu, but calling open() or close() is enough and the focus is automatically transferred as expected. Change-Id: I54406c7c6b8dd25af261e00ebb1ae00ccbea8b9f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Attempt to stabilize tst_applicationwindow::attachedProperties()J-P Nurmi2017-06-291-2/+3
| | | | | | | | | | | | Change-Id: I49539d41d78c2670bcbed1829800a5974f91675b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-06-291-3/+3
|\| | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickmenu.cpp Change-Id: I595ed1671fcad6c3b87123be2b825bca09552f0f
| * Fix typos in tst_applicationWindow::attachedProperties()J-P Nurmi2017-06-291-3/+3
| | | | | | | | | | | | | | | | | | It is supposed to test the ApplicationWindow attached properties on Control, Item, and QtObject, but the Item instances were accidentally made Control instances. Change-Id: I6caf24b50fc0ffe97396364cf6b10b0ad653d9ed Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Make ApplicationWindow::activeFocusControl work with plain WindowJ-P Nurmi2017-06-261-2/+50
| | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][ApplicationWindow] The attached activeFocusControl property has been made functional with a plain QML Window to make the functionality available when using QQuickWindow/View/Widget instead of ApplicationWindow. Task-number: QTBUG-61336 Change-Id: I46b91bca436d58c349c4f9ba8816245ab4ca33a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Cleanup whitespaceJ-P Nurmi2017-05-271-1/+1
|/ | | | | Change-Id: I453ec5ac798bb5904495b82c6e0e06c40b3a9a70 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix QQuickApplicationWindow::isComponentComplete()J-P Nurmi2017-04-211-0/+23
| | | | | | | | | | It has to default to true to ensure that a QQuickApplicationWindow instantiated in C++ is not stuck to false forever. When instantiated by the QML engine, it is set to false during the QML component initialization phase from classBegin() to componentComple(). Change-Id: Ieba2bbfb8fc0296b8cb28df91b12bcc55dd31bf4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* *.pro: osx -> macosJ-P Nurmi2017-04-201-1/+1
| | | | | Change-Id: I29b36eaa417986be24c917bc9c9b1f6441773e3d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-102-0/+116
|\ | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp src/quicktemplates2/qquicktextarea.cpp src/quicktemplates2/qquicktextfield.cpp Change-Id: Ie80a2d3bcbb961a38e3dffa247547d3d860c231a
| * Fix a crash with focus handling when destructing QQAppWindowJan Arve Saether2017-02-072-0/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because QQuickApplicationWindow connected SIGNAL(activeFocusItemChanged()) to SLOT(_q_updateActiveFocus())); it would enter _q_updateActiveFocus() from the dtor of QQuickWindow (because dtor of QQuickWindow would emit activeFocusItemChanged()). At that point the QQuickApplicationWindow object for the member function _q_updateActiveFocus() was already destroyed, so we would crash. Instead, make sure we clear the focus as early as possible, and then disconnect in case activeFocusItemChanged() is emitted after QQuickApplicationWindow is destroyed. Task-number: QTBUG-57846 Change-Id: I4b1999e647b970394436a2d462b7f352f1c8a811 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Update license headers to silence qtqa/tst_license warningsJ-P Nurmi2017-02-2410-20/+120
|/ | | | | | | | | | Sync with the qtbase/header.XXX. The license headers were matching qtbase/header.XXX-OLD, which makes qtqa/tst_license flood warnings: Old license being used for foo.qdoc Change-Id: I199bf303a2d648e0d5f7bc01cb0814a5f945eeff Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Welcome to 2017J-P Nurmi2017-01-0911-11/+11
| | | | | Change-Id: If68cff4efacc7dc5719c8b8e61937e85e9076870 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Avoid .qmlc files being picked up by Creator's locatorMitch Curtis2016-11-111-1/+1
| | | | | Change-Id: Ic3764ca6ba70b3b9557a6c2088698c40456a93f5 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-221-2/+2
|\ | | | | | | Change-Id: I37aab846346692fd4bff08b0dbab66db3a8e2716
| * Make ApplicationWindow.overlay attached property work with QML WindowJ-P Nurmi2016-09-211-2/+2
| | | | | | | | | | | | | | | | | | Since 14dd934c, we're using QQuickOverlay even with plain QML Window. Now that the overlay is guaranteed to always exist, we can make the attached property to give a reliable access to the overlay. Change-Id: I707fc52f6dfc7a0dbc9a3467646fb5feb36b9572 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-08-092-0/+99
|\| | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickpage.cpp Change-Id: I4c8b62fb1d7c20c6d3c870eb47e0402a20051098
| * AppWindow: take header & footer visibility into account in relayout()J-P Nurmi2016-08-092-0/+99
| | | | | | | | | | | | Task-number: QTBUG-55143 Change-Id: I2acf8ca720df33a0417d850b5b0410ec9166dc89 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Bump up all controls and templates imports to version 2.1J-P Nurmi2016-07-0810-12/+12
|/ | | | | | | | | | | | Controls must import templates version 2.1 in order to "inherit" 1-revisioned properties, methods, and signals. So far, this has been done case by case, but it's less error prone and more clear to change them all. For example, if you ever see a source file pasted/linked somewhere, it's easy to identify the version it belongs to. Change-Id: I41609ec1a22bc05ac3e79f953a147ca42d9e0786 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Popup: restore focus to contentItem of ApplicationWindow when closingMitch Curtis2016-05-112-0/+131
| | | | | | | | | In Controls2, Popup and normal content are in same window, then we should maintain the focus restore work. Task-number: QTBUG-53275 Change-Id: I57f5aaf3febf1b7d2071c1734d8561932f95c699 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* import Qt.labs.controls 1.0 => QtQuick.Controls 2.0J-P Nurmi2016-04-219-9/+9
| | | | | | | | | Docs, resources, .metainfo and plugins.qmltypes will be updated in follow up commits. Change-Id: I4438c5bfb8802bff0fa15c56431cfd288f179861 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* import Qt.labs.templates 1.0 => QtQuick.Templates 2.0J-P Nurmi2016-04-212-2/+2
| | | | | | | | | | | | | | Even though there never was such thing is QtQuick.Templates 1.0, we'll use version 2.0 to keep it in sync with QtQuick.Controls 2.0 (next step). The templates define (and in the future, revision) the API of the controls, so the two must have the same version or it will get messy. Docs and plugins.qmltypes will be updated in follow up commits. Change-Id: Idc2e76f32f348ba35eb4b1fa167c6868300aa910 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Controls: rename the C++ module to qtquickcontrols2J-P Nurmi2016-04-132-2/+2
| | | | | Change-Id: I087a39baebc296a340739161874636926adaa56c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Templates: rename the C++ module to qtquicktemplates2J-P Nurmi2016-04-132-7/+7
| | | | | Change-Id: I146da903b46f5c2caf865e37291c25376b49021a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Cleanup QQuickProxyStyleJ-P Nurmi2016-03-181-1/+0
| | | | | | | | | | | Install and remove the proxy theme automatically to eliminate the need for TestTheme do it in tst_applicationwindow. Furthermore, fix some Qt coding conventions, align header guards, remove unneeded empty destructor, and add missing explicit keywords for one-parameter constructors and cleanup somemeaningless ones in paremeterless ctors. Change-Id: Ib95dad003e35e468e941f3a0d2be5b21323fcccd Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename Qt Labs Controls to Qt Quick Controls 2 - build systemMitch Curtis2016-03-182-8/+8
| | | | | | | | | The imports will be done later, as we don't want to change them until the module is releasable (which requires things like selection handles, etc.). Change-Id: I2140cff7058fc3b696e92ca8c0e5e06dca9a7c9c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-311-0/+5
|\ | | | | | | | | | | | | | | | | Conflicts: src/templates/qquickpopup.cpp src/templates/qquickpopup_p_p.h src/templates/qquickspinbox_p.h Change-Id: Ief25ad2d27410f62e90879f60499ed87359406c3
| * tst_applicationwindow: a temporary workaround to unblock CIJ-P Nurmi2016-01-301-0/+5
| | | | | | | | | | Change-Id: Ia28054f5860bf65c87a0c8cfcc09f7c9a769c7cf Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-282-1/+34
|\| | | | | | | | | | | | | | | | | | | | | 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
| * QQuickApplicationWindow: resolve the default system theme fontJ-P Nurmi2016-01-282-1/+34
| | | | | | | | | | Change-Id: I6927ee293e5126abc037a3eb9f86a67825732679 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | C++11 keywordsJ-P Nurmi2016-01-211-2/+2
|/ | | | | | | | - Q_NULLPTR -> nullptr - Q_DECL_OVERRIDE -> override Change-Id: I8ee65caafd43ab41b6de43835200cac6c8ffa278 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* QQuickApplicationWindow: add locale propertyLiang Qi2015-12-212-0/+119
| | | | | Change-Id: I1292d1fb856710e38add8d77ae6e3dac28137cd9 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Expose the actual type of QQuickApplicationWindow::overlay()Mitch Curtis2015-12-151-0/+1
| | | | | | Change-Id: I4fdff4049d469781ad6324a0d85cc519bd95a038 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add ApplicationWindow::activeFocusControlJ-P Nurmi2015-12-103-33/+280
| | | | | | | | | This makes it possible for ApplicationWindow to visualize key focus navigation with a single focus rectangle that follows the currently active focus control. Change-Id: Ief92bcdc64891b7baa3503216137665a8badcd17 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* QQuickApplicationWindow: add font propertyLiang Qi2015-12-032-0/+148
| | | | | Change-Id: I6f946994f789704aa2efa94aaea0129d0d73d005 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* ApplicationWindow: introduce attached propertiesJ-P Nurmi2015-11-163-1/+280
| | | | | | | | The attached properties provide convenient direct access to an application window and its building blocks. Change-Id: I2d96842d80faec47c875156202c1e33a2af96ad3 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* tst_applicationwindow: use immediate operation to avoid random crashesJ-P Nurmi2015-11-121-1/+1
| | | | | | | | | | tst_applicationwindow::implicitFill() pushes an item on the stack and the stack gets destructed right away. This seems to be too much for threaded animator jobs... Change-Id: I7b83059424e49d6ae6dbf7ddcafe88550dec03cd Task-number: QTBUG-49338 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Enable tst_applicationwindowJ-P Nurmi2015-10-131-164/+160
| | | | | | | | The issue was fixed by 2f902694656d67d671d9a8616060d598a478e7b7. Change-Id: I5f4cb0ca8d968ce02f7e9e36070e34b3d887e9c0 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename QtQuick.Controls 2.0 to Qt.labs.controls 1.0J-P Nurmi2015-10-014-4/+4
| | | | | Change-Id: I142622dd85e95ef70b11132e77ccf48701f2cabc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* StackView: fix initialization of itemsJ-P Nurmi2015-08-271-2/+0
| | | | | | | | | | Only items that were created from pushed components were initialized. This change fixes item initialization for StackView::initialItem and pushed items. Change-Id: I6fe1afa233e63320180dfe8eac3874fed69cbb3b Task-number: QTBUG-47318 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add ApplicationWindow auto tests.Mitch Curtis2015-07-216-0/+531
These were copied from Qt Quick Controls. There are some issues with regards to QQuickThemeData, so some are commented out for now (see tests for details). I also added a test for QTBUG-47318. Change-Id: Iaee0f4531b8d7bc9b4984146aaf00b76afa77793 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 04:29:39 +0000