aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* add default designer content to tumblerTim Jenssen2017-03-141-0/+2
| | | | | Change-Id: Idcd36f81abf0968c7e85a04c0faf340e4309ef18 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Doc: restore the slider tooltip snippetJ-P Nurmi2017-03-141-0/+53
| | | | | | | | The snippet was removed in b026ebf67 when Slider::live was added, but it was not noticed that the snippet was also used in Tooltip docs. Change-Id: I8dac3bb90bc44ca447f9e34d0015443e6245d894 Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
* Wearable: get rid of the UIStyle dimensionsJ-P Nurmi2017-03-132-13/+2
| | | | | Change-Id: Ia4896fd2253cea9bc83bdd59bfdbaace216a9cb9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: cleanup FitnessPageJ-P Nurmi2017-03-131-4/+0
| | | | | Change-Id: I0ed565b04236ad4550b278e0a223636794d52bbf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: cleanup WeatherPageJ-P Nurmi2017-03-131-51/+16
| | | | | Change-Id: Iaed6c6370e9a8ec7e6e523ee87802d51531f5bba Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: cleanup NotificationsPageJ-P Nurmi2017-03-131-74/+41
| | | | | Change-Id: Idc8376405e113a9837fbe43fbf85681cf9ed8737 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: cleanup NavigationPageJ-P Nurmi2017-03-132-19/+12
| | | | | Change-Id: I3e6a3ffbcca962602d08aa9effce981396cc3cdb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: center align the world clocksJ-P Nurmi2017-03-131-6/+1
| | | | | Change-Id: I9389597db13acee93e66ee6979fae5e2dd5a0e90 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: cleanup AlarmsPageJ-P Nurmi2017-03-133-140/+31
| | | | | Change-Id: I918e69a8396cf57dd685cc2116722618a3d7fda4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: tweak the page indicatorsJ-P Nurmi2017-03-137-30/+13
| | | | | | | Move bottom margin from anchors as bottom padding to define it once. Change-Id: I2a93f86e2029c38f1d39555a55d969faec716d04 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Wearable: cleanup unnecessary currentIndex & clippingJ-P Nurmi2017-03-138-15/+0
| | | | | Change-Id: Ic0071690388871fcbb09af5f3b7255f1a7f81bcd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: remove unnecessary wrapper itemsJ-P Nurmi2017-03-135-533/+496
| | | | | | | | | | | Almost all pages were centering a fixed-size SwipeView. If the window was larger than assumed, swipes would only work in the center are of the window. Therefore it's better to stretch the view, and just center the content instead. This way swipes work consistently in the whole content area of the page. Change-Id: Idc2a2bc327a49314cbf1271fa34b74df5f633ed8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: move app-specific images into each app's own folderJ-P Nurmi2017-03-1351-68/+68
| | | | | Change-Id: Ie378f19a1ccfd962528f47263d03cac6bf7dc03f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Wearable: cleanup SettingsPageJ-P Nurmi2017-03-133-172/+77
| | | | | | | | | Replace the SettingsData (Item) type with QML Settings from Qt.labs.settings, and get rid of an unnecessary wrapper items and hard-coded image sizes. Change-Id: If41fbef5247c1648b881a97cbb94d4378b334f85 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: add style for PageIndicatorJ-P Nurmi2017-03-138-98/+90
| | | | | Change-Id: Id8f4948372f394ec5dbb4c2268f453724f65b594 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: rename WatchFace to WorldClockJ-P Nurmi2017-03-1316-14/+14
| | | | | | | To be consistent how the pages/apps are called in the UI vs. code. Change-Id: I721d3ebb8631aa97a1ab43e6924cd0e4d0f39d24 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Wearable: cleanup and make LauncherPage scalableJ-P Nurmi2017-03-132-136/+123
| | | | | Change-Id: I2c9bf50b1519976643bebe87198c02fcdca45a64 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: use AbstractButton for the PathView delegateJ-P Nurmi2017-03-131-53/+39
| | | | | | | | Move the app title outside the delegate. Its position is static, and its visible in one place only, so one instance is enough. Change-Id: If5a9f4cb7893980cef6a08fdc8adde929f187460 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: rename the pagesJ-P Nurmi2017-03-1310-16/+16
| | | | | | | | Even the code and the documentation talks about "pages", so call the types pages too. Change-Id: Ie0151be1b2344af6f7122ed22da6cc3b1ea634e4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: merge MainContainer.qml into wearable.qmlJ-P Nurmi2017-03-133-108/+28
| | | | | | | Utilize the header-content-footer layout of AppWindow. Change-Id: I50a53fd5c372161af738e5d53085c669cf2614b8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: add NaviButtonJ-P Nurmi2017-03-133-124/+98
| | | | | | | | Replace the hand-made home/back buttons with an AbstractButton-based custom type. Change-Id: Icc2555e9ef67ae7461a072caf2dae780aaeafba2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: remove unused importsJ-P Nurmi2017-03-132-3/+0
| | | | | | | | qmlimportscanner would detect these as dependencies and deploy them for nothing, which would be wasteful on a wearable device. Change-Id: I687a9f7e136210d1213eb6575429102bcb472d78 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: set the application background in the windowJ-P Nurmi2017-03-133-19/+7
| | | | | | | ApplicationWindow comes with built-in support for custom backgrounds. Change-Id: I524d346a39f28e916d87bef738ad0492ee686c0c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: utilize the styling systemJ-P Nurmi2017-03-1319-66/+70
| | | | | Change-Id: I6b7068c0416cdd16a98752241f6c3105652c9c08 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: replace translucent borderless Rectangles with plain ItemsJ-P Nurmi2017-03-135-20/+6
| | | | | Change-Id: Ie27fe1f7181dd7aad49062d2a37eb3a4a7db3781 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: remove PageContainerJ-P Nurmi2017-03-1311-69/+8
| | | | | | | The init() function and done() signal were both unused. Change-Id: I302e196ad6b0da423f0efb3394e307f6c3ed8c8b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add Wearable demoShrikant Dhumal2017-03-1375-1/+3279
| | | | | Change-Id: I3e287b85517c04803964c068e32bf8b6bcae5cb6 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Add ScrollView to designer item libraryThomas Hartmann2017-03-103-0/+16
| | | | | | Change-Id: If141c5dd6a0126c49f508590a5addb7f8e4b2159 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Build fix for -no-feature-validatorPaul Olav Tvete2017-03-101-0/+4
| | | | | Change-Id: I869b25ff2c9efe1c21def0baf4de0606c7c9baa2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Build fix for -no-feature-systemtrayiconPaul Olav Tvete2017-03-106-11/+34
| | | | | Change-Id: If991e2311f37c1977cdf2a913b3f022e5f999f5f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-109-9/+146
|\ | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp src/quicktemplates2/qquicktextarea.cpp src/quicktemplates2/qquicktextfield.cpp Change-Id: Ie80a2d3bcbb961a38e3dffa247547d3d860c231a
| * Add missing QML type registrationsJ-P Nurmi2017-02-202-0/+2
| | | | | | | | | | | | | | | | For the internal Radio and CheckIndicator types. Task-number: QTBUG-59026 Change-Id: I7e34f29e33ebd3d748892df0ba1592fe8ae5ed44 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Editors: fix mouse cursorJ-P Nurmi2017-02-082-4/+8
| | | | | | | | | | | | | | | | Read-only editors should not use the IBeam cursor, but switch to a plain arrow cursor. Change-Id: If579571ceff086af6b8259ade769b5efb27565db Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix a crash with focus handling when destructing QQAppWindowJan Arve Saether2017-02-073-0/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * tst_snippets: share a single QQuickView instance for all data rowsJ-P Nurmi2017-01-251-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | This test contains a lot of data rows. Re-creating a QQuickView for every data row puts a lot of stress on the system. In the new Open Nebula -based CI, things start consistently exploding after a random amount of tst_snippets data rows. This change fixes that. Task-number: QTBUG-58196 Change-Id: I6549944a6d7b2bd384d09ee974bee6423ffe625c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * QQuickPopup: allow window change after component completionJ-P Nurmi2017-01-251-2/+7
| | | | | | | | | | | | | | | | | | | | | | When visible has been set true, don't attempt to start the enter transition from componentComplete(), but wait until the popup is associated with a window. This makes it possible to share a single QQuickView instance for all data rows in tst_snippets. Task-number: QTBUG-58196 Change-Id: I9204e0d2e6468a21ee36f313daedc43d2e919ec6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Build fix for -no-feature-shortcutPaul Olav Tvete2017-03-082-0/+4
| | | | | | | | | | Change-Id: I89c037629037a73fd481d29b28bd15b1ba57af09 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Build fix for -no-feature-imPaul Olav Tvete2017-03-082-0/+6
| | | | | | | | | | Change-Id: I5cd37b78c18847c9535584d0452c8214873db5f2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Build fix for -no-feature-menuPaul Olav Tvete2017-03-081-0/+2
| | | | | | | | | | Change-Id: I5e8afbf0aa1704a13d359e7ddf867cd791b3f0db Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Build fix for -no-feature-texteditPaul Olav Tvete2017-03-081-0/+2
| | | | | | | | | | Change-Id: I606e0e68c16faceaddbddacb37eec7d557e184ce Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Platform Menus: support sub menus in the Qt Widgets fallback menusJ-P Nurmi2017-03-084-13/+26
| | | | | | | | | | | | | | | | | | Implement all the missing things and fix the type of the cast in QWidgetPlatformMenuItem::setMenu() to make sub menus work with the widgets fallbacks. Change-Id: I19bb010a5c639a77b76d1d92a47ad03576c06d2f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: visually indicate RangeSlider’s rangeMitch Curtis2017-03-062-0/+9
| | | | | | | | | | | | | | | | This makes the range that the user has selected clear, and is already done by other styles. Change-Id: Ib8f2c81e823193fa9934587d04fc011aafc0bd65 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Improve qtquickcontrols2-buttons.qdocMitch Curtis2017-03-061-8/+5
| | | | | | | | | | Change-Id: Ie417f6377016e1a28122efefcc9fcef5e642d027 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Improve qtquickcontrols2-popups.qdocMitch Curtis2017-03-061-1/+1
| | | | | | | | | | Change-Id: Iaf3159b993ada20a30a8208f7cfe92731966a3f7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Fix Button GIFMitch Curtis2017-03-022-0/+2
| | | | | | | | | | | | | | | | The background didn't show up unless setHighQuality(true) was used. Task-number: QTBUG-59233 Change-Id: Ief04c48b7c82d5c6be2e63de5c515cdf763a2064 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Make QQuickStyleSelector::select() more robustJ-P Nurmi2017-03-011-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While debugging QTBUG-59026, I found out that QLocale::name() is empty with the "C" locale. Because the empty locale name was used as a selector in QQuickStyleSelector, it ended up registering QML types using URLs that contained a double slash (empty locale selector matched): QtQuick/Controls.2/Material//RadioButton.qml At the same time, the QML engine imported implicitly internal QML types constructing the URLs directly based on the location on the file system without a double slash: QtQuick/Controls.2/Material/RadioIndicator.qml As a result, the same QML module ended up having types registered from two different URLs, which is not allowed. This change simply prevents both problems. First of all, if the locale name is empty for any reason, it won't be added anymore to the list of selectors. Furthermore, the final selected URL is normalized to avoid redundant dashes. Task-number: QTBUG-59026 Change-Id: I19b890451aaddfe4277bb6b26bc3c1394a75a704 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix QQuickStackViewPrivate::startTransition()J-P Nurmi2017-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This seems like a mistake that slipped in when popTransition(), pushTransition() and replaceTransition() were merged in acecb06. Only immediate push/pop/replace operations were affected, where the animations were force-completed by hand. In this scenario it was always passing the pop transitions for completion, even if the current operation was push or replace. Change-Id: I6a940953feaefe6643ddae26c070856a66bf6c10 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add missing includesJ-P Nurmi2017-02-244-0/+4
| | | | | | | | | | | | | | Found while doing a -no-accessibility build. Change-Id: I9772316eed3d544b21926970371a590ef2c15bef Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Port from QT_NO_ACCESSIBILITY to QT_CONFIG(accessibility)J-P Nurmi2017-02-2482-127/+129
| | | | | | | | | | Change-Id: I03deebff661746d49e537af5b1c8899b938efb0d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Port from QT_NO_CURSOR to QT_CONFIG(cursor)J-P Nurmi2017-02-244-4/+4
| | | | | | | | | | Change-Id: If7dd96ed25b1183586b903503b160fdeaef1ccea Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>