Commit Graph

17 Commits

Author SHA1 Message Date
J-P Nurmi 4bc6566462 Controls: rename the C++ module to qtquickcontrols2
Change-Id: I087a39baebc296a340739161874636926adaa56c
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-04-13 18:18:24 +00:00
J-P Nurmi a60c8e60d5 Templates: rename the C++ module to qtquicktemplates2
Change-Id: I146da903b46f5c2caf865e37291c25376b49021a
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-04-13 15:28:11 +00:00
J-P Nurmi 09e83913e9 Cleanup QQuickProxyStyle
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>
2016-03-18 22:14:34 +00:00
Mitch Curtis a0d44a1653 Rename Qt Labs Controls to Qt Quick Controls 2 - build system
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>
2016-03-18 11:51:12 +00:00
J-P Nurmi 19b967506d Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
	src/templates/qquickpopup.cpp
	src/templates/qquickpopup_p_p.h
	src/templates/qquickspinbox_p.h

Change-Id: Ief25ad2d27410f62e90879f60499ed87359406c3
2016-01-31 17:38:37 +01:00
J-P Nurmi 30fcc7358b tst_applicationwindow: a temporary workaround to unblock CI
Change-Id: Ia28054f5860bf65c87a0c8cfcc09f7c9a769c7cf
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-01-30 11:50:17 +00:00
J-P Nurmi 8318deb165 Merge remote-tracking branch 'origin/5.6' into dev
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
2016-01-28 17:22:53 +01:00
J-P Nurmi 1fd4797816 QQuickApplicationWindow: resolve the default system theme font
Change-Id: I6927ee293e5126abc037a3eb9f86a67825732679
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2016-01-28 12:57:36 +00:00
J-P Nurmi f4f5e85744 C++11 keywords
- Q_NULLPTR -> nullptr
- Q_DECL_OVERRIDE -> override

Change-Id: I8ee65caafd43ab41b6de43835200cac6c8ffa278
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-01-21 12:26:21 +00:00
Liang Qi ac61952c99 QQuickApplicationWindow: add locale property
Change-Id: I1292d1fb856710e38add8d77ae6e3dac28137cd9
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-12-21 16:48:02 +00:00
Mitch Curtis 116db64461 Expose the actual type of QQuickApplicationWindow::overlay()
Change-Id: I4fdff4049d469781ad6324a0d85cc519bd95a038
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-12-15 22:21:46 +00:00
J-P Nurmi eba39a3ba5 Add ApplicationWindow::activeFocusControl
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>
2015-12-10 21:03:43 +00:00
Liang Qi e3adcf2737 QQuickApplicationWindow: add font property
Change-Id: I6f946994f789704aa2efa94aaea0129d0d73d005
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-12-03 17:18:26 +00:00
J-P Nurmi 08c7db1f8d ApplicationWindow: introduce attached properties
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>
2015-11-16 15:58:10 +00:00
J-P Nurmi d671540209 Enable tst_applicationwindow
The issue was fixed by 2f90269465.

Change-Id: I5f4cb0ca8d968ce02f7e9e36070e34b3d887e9c0
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-10-13 10:17:31 +00:00
J-P Nurmi 1b5abea39e StackView: fix initialization of items
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>
2015-08-27 14:04:13 +00:00
Mitch Curtis 70e761fce2 Add ApplicationWindow auto tests.
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>
2015-07-21 09:35:20 +00:00