aboutsummaryrefslogtreecommitdiffstats
path: root/src/templates/qquickcombobox_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Templates: rename the C++ module to qtquicktemplates2J-P Nurmi2016-04-131-153/+0
| | | | | Change-Id: I146da903b46f5c2caf865e37291c25376b49021a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Cleanup whitespaceJ-P Nurmi2016-03-191-0/+1
| | | | | Change-Id: I97ac45fe3b3205f4f5073cb0c59215ba6c010a13 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename Qt Labs Controls to Qt Quick Controls 2 - build systemMitch Curtis2016-03-181-2/+2
| | | | | | | | | 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>
* Add increase/decrease methods to combobox control.BogDan Vatra2016-03-041-0/+3
| | | | | | | | It is useful in envs (e.g. Android TV) where Up/Down are used to select prev/next controls not to inc/dec the values of the control. Change-Id: I1b55dafccd4af83b0bfe65b572bd9e643a073625 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* QQuickComboBox: handle wheel events to respect wheelEnabledJ-P Nurmi2016-03-041-0/+1
| | | | | Change-Id: I372c56d5a8fdda575d1e9a3d5fe4281c2c4f8c3c Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-281-1/+0
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Replace Popup::pressed|releasedOutside with close policy flagsJ-P Nurmi2016-01-281-1/+0
| | | | | | | | | | Change-Id: I3e09c4e2b6cbbe39bdf9e943905664e5dc1fe954 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
| * Add Popup::parentJ-P Nurmi2016-01-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parent defaults to the QML parent object where Popup is declared. Popup::x/y are relative to the parent, and the popup also automatically follows the parent as appropriate. QQuickPopupPositioner has been adapted from Qt Quick Controls 1. It was called QQuickScenePosListener, and it was implemented for the text selection handle popups. ComboBox's popup now follows the control eg. when scrolling, but the below/above positioning feature is temporarily gone missing. It will be restored in a follow up commit. Change-Id: I8a6b58cd74e07f33930abc35d0ab9da056685128 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | C++11 keywordsJ-P Nurmi2016-01-211-13/+13
|/ | | | | | | | - Q_NULLPTR -> nullptr - Q_DECL_OVERRIDE -> override Change-Id: I8ee65caafd43ab41b6de43835200cac6c8ffa278 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Implement QQuickComboBox::defaultFont()J-P Nurmi2016-01-151-0/+2
| | | | | Change-Id: I99a5b899effbd1c5b758f12a96c336266539892e Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Replace Q_DECLARE_TYPEINFO(T, Q_COMPLEX_TYPE) by QML_DECLARE_TYPE(T)J-P Nurmi2015-12-211-2/+2
| | | | | | | | | | | Q_COMPLEX_TYPE tells Qt containers that the type has a ctor/dtor and that it may not be moved in memory using memcpy(). QML types are never stored by value in Qt containers (non-copyable QObjects), so the type info declaration is superfluous. QML_DECLARE_TYPE, however, is useful (QTBUG-49920) and consistently used for all QtQuick types. Change-Id: I3bd1718b306fa7af85a623fa7a17e1b9653d2152 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename Panel to PopupJ-P Nurmi2015-12-091-5/+5
| | | | | | | | | Popup is a more descriptive name. Furthermore, this name change opens the door for another type called Pane. It gives the appropriate background color for the current style & theme. Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add ComboBoxJ-P Nurmi2015-12-041-0/+146
Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>