summaryrefslogtreecommitdiff
path: root/examples/quickcontrols
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-302-6/+26
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia33462a31303ae79f7a6ef26dc6065a0afeef3e1
| * Fix outdated FDL license headerKai Koehne2017-10-182-6/+26
| | | | | | | | | | Change-Id: I03c222a72490959d55b3077a6282553a4bfcf7d2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Doc: add documentation to Dashboard examplev5.10.0-beta2Nico Vertriest2017-10-112-6/+10
| | | | | | | | | | | | Task-number: QTBUG-60648 Change-Id: I79b9fdfde18041d95b7aa422bfb4d188ed907589 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Example: Update to the new QObject::connect syntaxVenugopal Shivashankar2017-09-121-2/+2
|/ | | | | | | | | | The QSortFilterProxyModel-based proxy model forwards the rowsInserted and rowsDeleted signals. Task-number: QTBUG-60631 Change-Id: I51a46cd13a89ea22b8bb4807821b3f21f6893b19 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* remove bogus QTPLUGIN+=qsqlite magicOswald Buddenhagen2017-05-291-2/+0
| | | | | | | | | | the code was originally meant to link the plugin if it's not built into qtsql. this logic did not survive the various build system refactorings, but it's also entirely pointless, because available static plugins are now automatically linked. Change-Id: I85039dbb123ab4fa1089b898041ab6d3ddb2e44c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* texteditor example: Fix path to editpaste iconv5.9.0-beta4Friedemann Kleint2017-05-041-1/+1
| | | | | | | | | Drop prefix so that it can be found from either resources or files. Change-Id: Ib9dcab86f22bff0f8a3d7f0f22aa35d717b3569f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix sqlite detectionLars Knoll2016-09-121-1/+1
| | | | | | | There is now a sql-sqlite feature in qtbase that should get used. Change-Id: I8abc60bec5c0fa64d180150c598f0a6605844473 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-271-0/+6
|\ | | | | | | | | | | | | Conflicts: tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp Change-Id: I0b6018fdac65a5385136e4c3561fba1c52ecd32e
| * texteditor example: check if document is null before using itMitch Curtis2016-08-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | This hasn't been an issue so far probably because those properties were accessed after m_doc had been set. However, adding some debug text can trigger a crash: Text { text: "document.cursorPosition=" + document.cursorPosition } Change-Id: Ib468815cdc0b103a2384457ab937cc3b764b96c8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-1087-264/+1113
|/ | | | | | | | Conflicts: examples/quickcontrols/extras/flat/main.cpp src/controls/Private/qquickcontrolsettings.cpp Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
* fix example installsOswald Buddenhagen2016-04-28195-0/+12630
this includes renaming the first-level subdir of examples/. Change-Id: Idf14164533c247e5c0cc5acdb405ac97f7c33ac5 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
View Lorry Controller Status