summaryrefslogtreecommitdiff
path: root/src/extras
Commit message (Collapse)AuthorAgeFilesLines
* Enable the use of QML caching at build timev5.9.0-beta2Simon Hausmann2017-04-111-0/+2
| | | | | | | Task-number: QTBUG-58571 Change-Id: I11c9dfb4e0fad93b2961db4213f934eca7d214df Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Remove qrc based default qml distribution for QQC extrasSimon Hausmann2017-04-033-25/+3
| | | | | | | | This is consistent with the other modules and prepares for the use of qml caching. Change-Id: Ifab9187ac60a52d0464c5afe46772a9da1489c73 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Remove spurious Q_INIT_RESOURCE callsSimon Hausmann2017-04-031-3/+1
| | | | | | | | | These explicit resource initialization calls are only needed when linking statically. Change-Id: I5518e1b32d4fc7c1d03d35dd15bf3ce65d5eafcf Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Build fix for -no-feature-picturePaul Olav Tvete2017-03-033-0/+9
| | | | | Change-Id: I4ace999ad45dc299a9a0d9b24c87823c762f3821 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-011-1/+1
|\ | | | | | | Change-Id: I316bcbbc5308fda27728df15db1e780aa073da2a
| * fix tooltip usageTim Jenssen2016-06-201-1/+1
| | | | | | | | | | Change-Id: I305659b22f680eea903bf2e02a2998b9f71f5f5f Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* | Adding white space to names for item libraryThomas Hartmann2016-07-011-5/+5
| | | | | | | | | | Change-Id: If4298f002ff17e737e49b468a17de7b115570bb1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Revert "Fix Controls 1 types linking to Controls 2"Topi Reinio2016-06-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | This reverts commit b5a8306bf6d4949066872ac2afc8d0a01f716bd7. The incorrect \inherits commands caused property documentation from base types go missing. Task-number: QTBUG-54150 Change-Id: I0bbe604a6fe904d8e6a4596777262255a794ec62 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix Controls 1 types linking to Controls 2v5.7.0-rc1v5.7.05.7.0Mitch Curtis2016-05-261-0/+1
| | | | | | | | | | | | Task-number: QTBUG-53529 Change-Id: I4933a03c49dee4e3edc56dd406f67073da341ac1 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-191-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia45d6b4318ffe60c386c8548de7bb3f07c4cd6f9
| * Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-121-1/+1
| | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: Icd9ae9ef887b99b96177ec7b590fc3f35da18c82 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-104-5/+6
|\ \ | |/ | | | | | | | | | | | | Conflicts: examples/quickcontrols/extras/flat/main.cpp src/controls/Private/qquickcontrolsettings.cpp Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
| * Cleanup QQmlExtensionInterface usageJ-P Nurmi2016-05-062-2/+2
| | | | | | | | | | | | | | | | Use the pre-defined macro. Change-Id: I52e362672ff719202d3e40e4245baac2af29f624 Task-number: QTBUG-53208 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * fix example installsOswald Buddenhagen2016-04-281-2/+2
| | | | | | | | | | | | | | this includes renaming the first-level subdir of examples/. Change-Id: Idf14164533c247e5c0cc5acdb405ac97f7c33ac5 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * QQuickMouseThief: guard the target item with a QPointerJ-P Nurmi2016-04-281-1/+2
| | | | | | | | | | | | | | | | | | | | tst_extras::Tests_Common::test_resize(PieMenu) is constantly crashing in the Win 10 CI. This is a random shot attempting to solve the crash. We're not able to reproduce the issue locally or even when running the test manually on the CI. Change-Id: I4722b7ea9aeca640991602d1148a61eaa91066b3 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-0811-0/+0
|\ \ | |/ | | | | Change-Id: Ic78345c599719f3dd80b1d6a6004d46a085da4af
| * Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-2211-0/+0
| | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I88acc450a8af929b011286d2ba2f81e75ed0faa9 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Enable using the module in a statically built applicationAndy Shaw2016-03-155-7/+30
| | | | | | | | | | | | | | Task-number: QTBUG-35754 Task-number: QTBUG-45868 Change-Id: I9bb332bc85713a17f02f3e7e768592e3234edfe3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Unify license header usageAntti Kokko2016-02-044-20/+20
| | | | | | | | | | | | | | Updated FDL license headers Change-Id: I867e7f1cb551f2141a4344d505bbf5d694df4720 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Unify license header usageAntti Kokko2016-02-0481-972/+1215
|/ | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I3c851bc24da89f6300b94199387d1adf16ca4f48 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Update plugins.qmltypesKai Koehne2015-11-191-23/+67
| | | | | | | Change-Id: Iae6420d4e0f0f1ef374cce4ab91101e3b04af6bf Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix proxy menu crashJ-P Nurmi2015-11-171-0/+1
| | | | | | | | | | | | Mobile-centric ApplicationWindowStyle implementations (Flat & Android) use a proxy menu to morph menubar items into a single menu button. The items are owned by the menubar and must not be deleted by the proxy menu. Otherwise, depending on the destruction order, the items would get deleted twice. Change-Id: I92d0c45fc3274574fd1edf34d8d3d081990f2727 Task-number: QTBUG-48927 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-281-1/+1
|\ | | | | | | Change-Id: I7177ee6f1dc74d7f0d2ac9a3aedcc8d7a00cee41
| * Fix compile error when building Qt in a namespace on OS XAndy Shaw2015-10-081-1/+1
| | | | | | | | | | | | Change-Id: I1c9e3edf401b4a6b02bafe4086a57679b4ada79c Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Adding animation interval for tumblerKarim Pinter2015-10-221-6/+5
| | | | | | | | | | | | | | | | | | | | Extending the Tumblers setCurrentIndexAt method with timeinterval, which is set to the animation so while it changes it can move slower then default. Task-number: QTBUG-48680 Change-Id: Ic8e76c604bad928ae7b11cfbea76c11d5d295f80 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | GroupBoxStyle: work around Binding regressionMitch Curtis2015-10-221-2/+2
| | | | | | | | | | | | Change-Id: I1541593e3aed08a82a0041a68c93a3cb753236fc Task-number: QTBUG-48918 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The examplesinstallpath variable in .qdocconf files defines the path under QT_INSTALL_EXAMPLES where examples are found. To match the way examples are packaged in Qt 5.6, prefix the install path with the repository name. Task-number: QTBUG-48736 Change-Id: I5630d8d7a566d57fea84447ca6099d8ab95bc681 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Simon Hausmann2015-10-021-1/+1
|\ \ | |/ | | | | Change-Id: Ie26c941c33fdd8baab49dc13b84d02e2b83af5e1
| * Flat style: set correct classname to enable static linkingRichard Moe Gustavsen2015-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | The classname in qmldir needs to match the name of the c++ class that represents the plugin. Otherwise qmlimportscanner will be confused. Task-number: QTBUG-47489 Change-Id: Iac56803127cad7bf072f29c611936df16dcf32d4 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Enable the build of Layouts with QT_NO_ACCESSIBILITYLiang Qi2015-09-151-0/+2
|/ | | | | | Change-Id: I8936d86f9cac5b0cc6231dc08fb986129c68f599 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Doc: Fix TumblerColumn::currentIndex property documentationTopi Reinio2015-08-041-1/+1
| | | | | | | | | | | QDoc gets confused if 'readonly' is mentioned as one of the parameters to \qmlproperty. The read-only qualifier is already detected from the property declaration, so we don't have to mention it twice. Change-Id: I14834aeca5aac99ea55ca9eacbff2bef8c0ee5f1 Task-number: QTBUG-47576 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Extras: remove version requirement notices.Mitch Curtis2015-07-062-3/+1
| | | | | | | | | The entire module is "new" with 5.5, and there are already \since statements in place declaring this. Change-Id: I76bc2941a520a82de0bd9780ac1786d5430acd0f Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* StatusIndicator: fix error when only including QtQuick.Extras.Mitch Curtis2015-06-031-0/+1
| | | | | | | | | | | | | Include QtQuick.Controls in StatusIndicator.qml to ensure that the Settings singleton is known, otherwise we get: qrc:///ExtrasImports/QtQuick/Extras/StatusIndicator.qml:115: TypeError: Cannot read property 'color' of null qrc:///ExtrasImports/QtQuick/Extras/StatusIndicator.qml:92: ReferenceError: Settings is not defined Change-Id: I61d47bcf4e7ee43a932f8f55a2e2d700a849618f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix Qt Quick Extras plugin when built against Qt with namespacesSimon Hausmann2015-06-011-1/+6
| | | | | | | | | | | | Q_INIT_RESOURCES declares an external symbols, and if therefore Q_INIT_RESOURCES is within a namespace, it will also think that declared symbol has to be in the namespace. However our rcc generated symbols are in the global namespace, so that's also from where we need to call Q_INIT_RESOURCES. Task-number: QTBUG-46393 Change-Id: Id3b5f4fbf561724811e3e9aec7d37def20903ea7 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Run optipng -o7 -strip "all" over all images in styles.Alessandro Portale2015-05-2217-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strip contained color profiles causing the warning: libpng warning: iCCP: known incorrect sRGB profile arrow-down.png 184 -> 99 bytes arrow-down@2x.png 212 -> 138 bytes arrow-left.png 114 -> 98 bytes arrow-right.png 114 -> 99 bytes arrow-up.png 186 -> 112 bytes arrow-up@2x.png 229 -> 155 bytes button.png 3321 -> 554 bytes button_down.png 2972 -> 203 bytes check.png 2880 -> 176 bytes check@2x.png 3075 -> 417 bytes editbox.png 3132 -> 416 bytes focusframe.png 3070 -> 271 bytes groupbox.png 485 -> 225 bytes header.png 3099 -> 383 bytes knob.png 5495 -> 1703 bytes leftanglearrow.png 2864 -> 206 bytes needle.png 4354 -> 2036 bytes progress-indeterminate.png 2112 -> 1453 bytes rightanglearrow.png 2886 -> 228 bytes scrollbar-handle-horizontal.png 939 -> 825 bytes scrollbar-handle-transient.png 249 -> 153 bytes scrollbar-handle-vertical.png 3629 -> 839 bytes slider-groove.png 3378 -> 565 bytes slider-handle.png 3315 -> 524 bytes spinner_large.png 15085 -> 8401 bytes spinner_medium.png 5934 -> 2772 bytes spinner_small.png 4582 -> 1810 bytes tab.png 460 -> 390 bytes tab_selected.png 498 -> 437 bytes circulargauge-icon.png 1542 -> 373 bytes circulargauge-icon16.png 1349 -> 249 bytes delaybutton-icon.png 1509 -> 343 bytes delaybutton-icon16.png 1291 -> 220 bytes dial-icon.png 1467 -> 326 bytes dial-icon16.png 1247 -> 217 bytes gauge-icon.png 1182 -> 189 bytes gauge-icon16.png 1145 -> 163 bytes picture-icon.png 1245 -> 220 bytes picture-icon16.png 1189 -> 177 bytes piemenu-icon.png 1578 -> 378 bytes piemenu-icon16.png 1334 -> 242 bytes statusindicator-icon.png 645 -> 316 bytes statusindicator-icon16.png 404 -> 212 bytes togglebutton-icon.png 495 -> 340 bytes togglebutton-icon16.png 298 -> 223 bytes tumbler-icon.png 188 -> 187 bytes Task-number: QTBUG-39788 Task-number: QTBUG-46229 Change-Id: Ic5128354a0aa4956275314cb7a9b8c13ea831436 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* QQuickPicture: add missing QDebug includev5.5.0-beta1J-P Nurmi2015-04-211-0/+1
| | | | | | | | On windows7x86wince70embeddedarmmsvc2008: qquickpicture.cpp(118) : error C2027: use of undefined type 'QDebug' Change-Id: I81efd9b922b8642892f89aca59b768d1b411739b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* PieMenu: Remove unused declared variableCaroline Chao2015-04-211-1/+0
| | | | | Change-Id: Ie92d117c2ad9c6d9540c22594daeb3823db75b26 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Doc: Qt Quick Extras: Remove instructions to build documentationTopi Reinio2015-04-101-12/+0
| | | | | | | No need for it as the module is now part of Qt. Change-Id: I17a4e4e8c031eaf80412890c90614c19e1a25b16 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Revert "Fix qrc path prefix in flatstyleplugin"Andras Becsi2015-04-091-1/+1
| | | | | | | | | This was incorrectly based on an outdated version and caused "qmlRegisterType requires absolute URLs" errors when the plugin was loaded. Change-Id: If106e542d80f44d8acac7501271409f0ecfa8c3e Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Fix Blackberry buildSergio Martins2015-03-311-2/+2
| | | | | | | | | | | | Private/qquickmathutils.cpp:101:73: error: 'cos' was not declared in this scope Private/qquickmathutils.cpp:101:73: note: suggested alternative: /opt/bbndk/target_10_3_1_995/qnx6/usr/include/math.h:1534:2: note: 'std::cos' Private/qquickmathutils.cpp:102:74: error: 'sin' was not declared in this scope Private/qquickmathutils.cpp:102:74: note: suggested alternative: /opt/bbndk/target_10_3_1_995/qnx6/usr/include/math.h:1541:2: note: 'std::sin' Change-Id: I938ff0e8adfc5431fae48edcdbc87fda9b715024 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Fix qrc path prefix in flatstylepluginAndras Becsi2015-03-171-1/+1
| | | | | | | | The prefix should start with ':/' instead of 'qrc:/'. This fixes 'File not found' errors when using this style. Change-Id: Ie49e009fcf935d9bbb5f9ea9fb8e17d4766f270e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Doc: Fix qml method signaturesCaroline Chao2015-03-131-3/+13
| | | | | | | | | | So the return value and parameters can be seen in the documentation. + Fix minor doc issues Change-Id: I99e520c103bb0faeb88b26eb7b9ff73922851abc Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Fix qtdoc warningsCaroline Chao2015-03-0610-36/+35
| | | | | | | | | Mostly link errors and missing documentation. And removed useless references to {QtQuick.Controls.Styles} in the doc. Change-Id: Iad211a574c0bd23c84e067e0cbcc18c3e719cde7 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Extras: Update plugins.qmltypeMitch Curtis2015-03-062-18/+6
| | | | | | | | Including adding an import that was required to fix an error while running qmlplugindump. Change-Id: I728827a516b1fcd15aed523d4ff38bb195d34fcb Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Doc: Fix Can't link to 'QPicture'Sergio Ahumada2015-03-041-1/+1
| | | | | Change-Id: I588438a5642fade8dd092614648ba7f156388da5 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Merge Extras' styling system into Controls'.Mitch Curtis2015-03-0292-4909/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removes the duplicated style settings functionality in Extras and simplifies the installed styles directory structure. - Extras' Base style is now part of Controls' Base style, eliminating the need for a separate QtQuick.Extras.Styles import. The cost of doing this should be negligible: a few QML files and two images. If we didn't merge Extras' Baste style into Controls', we'd need extras-specific code in qquickcontrolssettings, as the default style search path is: qml/QtQuick/Controls/Styles/ Whereas the Extras Base style would be in: qml/QtQuick/Extras/Styles/ The Extras Base style can't go into Controls' Base style directory, either, because otherwise we'd have two qmldir files there. The Flat style doesn't have this problem because it is all contained in one plugin and gets installed into its own Flat/ folder. - Documentation now lists the Extras controls as \since QtQuick.Extras 1.4. - Adds the customcontrolsstyle auto test to ensure that custom styling is tested. Change-Id: I19ca7a8b7e1c1daa85b272f4ccf9a2f05c76e0d9 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Extras: update QMAKE_DOCS after removing compatibility .qdocconf file.Mitch Curtis2015-02-261-6/+1
| | | | | Change-Id: I0ef9396789c5ddfcc22553aa8cd74f76ad7d9f6e Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* ToggleButton: correct text color.Mitch Curtis2015-02-241-1/+1
| | | | | | | | It was FlatStyle.mediumFrameColor ("#b3b3b3") but should be FlatStyle.darkFrameColor ("#999999"). Change-Id: I63c1a870fa064f2d7f99843cbe80c8d44822df78 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Exclude the Designer extras from the translation.Friedemann Kleint2015-02-191-0/+2
| | | | | | | | | | Prevent the translatable strings from the Designer specifics subdirectory from showing up in the translation files qtquickcontrols_<lang>.ts and thus translations loaded at runtime. Change-Id: I87b18a5ef7ed4b547dca9c738ffafe665e089235 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Import Qt Quick Extras (the former Qt Quick Enterprise Controls)Mitch Curtis2015-02-13194-0/+15984
Change-Id: I59c5c97c564f707da4ce617e25e13ff8124f7d4b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
View Lorry Controller Status