aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Correct two link errorsv5.9.0-beta1Nico Vertriest2017-03-301-2/+2
| | | | | | | | qtquickcontrols2-customize.qdoc:28: Can't link to 'Creating Qt Quick Projects' qtquickcontrols2-customize.qdoc:28: warning: Can't link to 'Creating C++ Classes' Change-Id: I5ddc57215fd65fa6a80819ee694b5e031676f5a7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: add missing \since to SwipeView::orientationJ-P Nurmi2017-03-291-0/+1
| | | | | | | The property was added in 4a97498. Change-Id: I0f21f499e74450780db85d5c2c92aa4a0367c3b5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: list available import versions in each Qt releaseJ-P Nurmi2017-03-291-0/+42
| | | | | Change-Id: I5bce83d66615f11588988947d088d4b6ce5240b2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: prepare the launcher page icons for high DPI and stylingJ-P Nurmi2017-03-2912-12/+12
| | | | | | | | | | Separate the icon and its background to make the background stylable and to provide the icons in high DPI versions later. Some icon files have been renamed to match the sub-app name. When this example reaches dev, we can use the built-in icon support with named icons. Change-Id: Id87d1a001476194eb7e803802c90e7089f92b3b1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Attempt to fix tst_snippets on OS X 10.10J-P Nurmi2017-03-291-8/+7
| | | | | | | | | | Don't show the window until we start taking the screenshots and actually need a visible window. Task-number: QTBUG-58606 Change-Id: I2fcab3b54f0faf67588a21e0732d2e6dbcee9194 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* ComboBox: cleanup superfluous QtQuick.Window importsJ-P Nurmi2017-03-283-3/+0
| | | | | | | The Window attached property has not been used since 3bbd90c7. Change-Id: I09e0c620aa83533c98316f50d6bfe3fd292761d4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Universal/SwipeDelegate: remove native text rendering leftoverJ-P Nurmi2017-03-281-1/+0
| | | | | | | | Native text rendering was removed in 3f5a66eb at the same time SwipeDelegate was being developed. Change-Id: I14eb1f335963abb9ead9450d62262990a3abc7d9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: update the Wearable Demo docsJ-P Nurmi2017-03-282-99/+111
| | | | | | | | | | The demo was originally written to become a Qt Quick demo. Focus on the QQC2 specifics now that it became a QQC2 demo instead. There were also some outdated references after being refactored a bit after the initial submission. Change-Id: I96ef3f4745a295b2d8ab12a30fcbdf41a2c50626 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: fix linking error in qquickdial.cppJ-P Nurmi2017-03-281-1/+1
| | | | | | | | | | | Dial::valueAt() does not exist. qquickdial.cpp:515: warning: Can't link to 'valueAt()' The broken see also link was accidentally copied from Slider. Change-Id: I781b7d0bcf15d3b34dd2b8784a273d5cd7218469 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Pass a parent to QQmlContextsMitch Curtis2017-03-243-3/+3
| | | | | | | | To avoid crashes in the future. Task-number: QTBUG-59532 Change-Id: Ie81f95939fc5655567f9d987cf040daf3a32df43 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* StackView: provide better warnings and errorsJ-P Nurmi2017-03-246-22/+71
| | | | | | | | | Check for valid URLs and test object types. Throw warnings when appropriate instead of crashing later. Task-number: QTBUG-59634 Change-Id: Ia269dc8afd31b618f1ff7aec94d684029cb78244 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add QQuickStackViewPrivate::warn() helperJ-P Nurmi2017-03-243-6/+23
| | | | | | | | | Store the current operation name internally to allow throwing informative warnings when component creation fails. Task-number: QTBUG-59634 Change-Id: I7506c5eb4be35878c8abd73a637357e0d8ae08a2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* StackView: improve the component creation errorsJ-P Nurmi2017-03-242-4/+6
| | | | | | | | | | Previously it just dumped the error from the component, without telling that it was anyhow related to StackView. Now it uses the standard QML warning syntax and includes the name of the operation (push/replace). Task-number: QTBUG-59634 Change-Id: Iea8df51f587c243ca065627e59bb0e5b5b526664 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickSwipePrivate: parent delegate context to controlMitch Curtis2017-03-241-1/+1
| | | | | | | | | This fixes a crash in QQuickSwipeDelegatePriavte's destructor when using QML debugging. Task-number: QTBUG-59532 Change-Id: I55f97039eb723652fec24e4c3a8ce5d1a8fb6c41 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Popup.qml: fix typoJ-P Nurmi2017-03-233-3/+3
| | | | | | | Task-number: QTBUG-59661 Change-Id: I35627bafc57266cb7b2842fe02765536ca7eecba Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Doc: fix Control::localeJ-P Nurmi2017-03-221-4/+4
| | | | | | | | | The documentation body was clearly copied from Control::font. Locale doesn't have mutable properties. Instead, one has to create a locale using Qt.locale(). Change the wording to match that. Change-Id: I637b00808c29c16ee768820be327e3c780cfee64 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: add missing docs for ApplicationWindow::localeJ-P Nurmi2017-03-221-0/+14
| | | | | Change-Id: I799eb73a05842b1990b5615fd01ad5204c554f20 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickComboBox: don't emit highlightedIndexChanged() during destructionJ-P Nurmi2017-03-211-3/+1
| | | | | | | | | | | | | If QQuickComboBox was destroyed while its popup was open, it emitted highlightedIndexChanged() during the destruction due to the popup's visibility change. Use setPopup(nullptr) to destroy the popup in a controlled manner, that is, disconnecting the relevant signals first. This way deleting the popup doesn't have weird side-effects during the destruction of QQuickComboBox. Task-number: QTBUG-57650 Change-Id: I1c55707be68a24e115276ffb6dfa1c89051a45ea Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update expected result of SwipeDelegate warning messagesMitch Curtis2017-03-201-1/+1
| | | | | | | | | It looks like af9536deeaf1123aaae5ce78cee7b4014a01d595 (in declarative) changed the format of warning messages. Task-number: QTBUG-59536 Change-Id: I9a8228448ef136f65258b985c3dddf011063c49c Reviewed-by: Liang Qi <liang.qi@qt.io>
* Revert "Temporarily comment out line number-dependent SwipeDelegate tests"Mitch Curtis2017-03-201-104/+103
| | | | | | | | | | This reverts commit 6a5e030fbfa5f2adeabc6284f6ae3993e3d658c7. The qt5.git integration went through, so this can be reverted now to make way for a proper fix. Change-Id: I73f9aef29683172360e85026e1c8c93b8409eeae Reviewed-by: Liang Qi <liang.qi@qt.io>
* Fix AbstractButton 2.2 registrationJ-P Nurmi2017-03-201-1/+1
| | | | | | | | | | | | | | qmlRegisterRevision() registers a nameless type, so using it would make AbstractButton throw confusingly formatted warnings: QML : <warning> instead of QML AbstractButton: <warning> Change-Id: I6b51824ad019ed9451079cf8a2595e908ef8187e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Temporarily comment out line number-dependent SwipeDelegate testsMitch Curtis2017-03-171-103/+104
| | | | | | | | | This is needed in order for af9536deeaf1123aaae5ce78cee7b4014a01d595 to be integrated into qt5.git. Task-number: QTBUG-59536 Change-Id: Ie1405a498018473029ce34de7dd95189aa75f203 Reviewed-by: Liang Qi <liang.qi@qt.io>
* fix capitalization of item library nameTim Jenssen2017-03-141-1/+1
| | | | | Change-Id: Ie371dced41ed86373aeb0a4600cb0245b4550b7e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* add FontSection to all controlsTim Jenssen2017-03-1422-0/+88
| | | | | Change-Id: I0352376201a1efd318f89a758dd8dc5a269742f4 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* 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>