summaryrefslogtreecommitdiff
path: root/src/plugins/qtsupport/exampleslistmodel.cpp
Commit message (Collapse)AuthorAgeFilesLines
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Examples: Support new mainFile attributeEike Ziller2014-06-171-2/+11
| | | | | | | | Qt 5.3 adds a mainFile="yes" attribute to the fileToOpen tag for the file that should be visible after opening the files. Change-Id: I3ff67e514a16811cc730633e0fbcc470c4e54e5e Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* ProjectExplorer: Use more algorithmsDaniel Teske2014-06-161-17/+13
| | | | | | | | | Make heavy use of lambdas Change-Id: I53197d0ffb4ae8eec076f15335cc22b74e1def1d Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Examples: Remove unused internal APIEike Ziller2014-06-161-12/+0
| | | | | Change-Id: Iba3da7fb1d45630e0986a83ef004e5b9b08fb0c7 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QtSupport: Fix indentation of conditionOrgad Shaneh2014-05-061-1/+2
| | | | | Change-Id: I64563971749ab47d0f144bd90fbd22558783fc55 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Use double quotes instead of single quotes as per our guidelines.Christian Kandeler2014-04-221-7/+7
| | | | | Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Revert "Welcome: Store examples search text in settings"Alessandro Portale2014-04-081-11/+0
| | | | | | | | | | | This reverts commit 894ade6f1e2767a8866642a4ea278659730c26d8 Storing the search text was not thought well through. It causes bad user experience. Also, the real solution for showing filtered Example sets in the chooser is coming here: https://codereview.qt-project.org/#change,82906 Change-Id: Ibb51bf5c0fa08fdeb8530a19d823ba97a3c167d1 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Welcome: Store examples search text in settingsAlessandro Portale2014-04-021-0/+11
| | | | | | | | | in QtCreator.ini under "WelcomePage/ExamplesSearchString". The installer pre-set that setting, and in that way pre- select a set of examples. Change-Id: I8ac5a38ad0bd3f33875ef1997ccbf0352410dcc3 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Fix crash if no qt version is registeredKai Koehne2014-04-011-0/+3
| | | | | Change-Id: Ib3b4b2379999061b04923b98044ed83743cd6423 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* WelcomePage: Support additional (non-qt) example setsEike Ziller2014-03-311-106/+210
| | | | | | | | | | | | | | Added with setting "Help/InstalledExamples" which is a string list, each string is a triple of (display name, manifest parse path, examples path), joined with '|'. If a documentationPath for a Qt version is already added through the InstalledExamples setting, we do not show an extra combo box item for it. That makes it possible for an installer to register a single example set for the same Qt version in different variants (e.g. iOS, Android x86, Android arm) Change-Id: I42dd8f9ca9cb6cee247e3dc8ce9d014e56852e79 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Examples: Remove loading of *.xml files from Qt demos/examples dirKai Koehne2014-03-131-10/+0
| | | | | | | | Not sure what this code path did originally, but since at least Qt 4.8.0 examples, demos manifest files are only in doc. Change-Id: I6edf1f712fc06d290edf0fe978a6635966084e60 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Remove Qt 4 fallback for examples browserKai Koehne2014-03-131-69/+19
| | | | | | | | Remove fallback file, and rather use the examples-manifest.xml, demos-manifest.xml files that are part of Qt 4.8.0 or newer. Change-Id: I6291bd01b75b891a5ddab7fb01cdfc29ed8bec34 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Move management of 'selected' Qt version to ExamplesListModelKai Koehne2014-03-131-58/+79
| | | | | Change-Id: Ia4c73a0e9985e968265d7698e3a0a3cc58dc7aaa Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Unify selection of 'valid' Qt versions for welcome pageKai Koehne2014-03-131-46/+46
| | | | | Change-Id: I79ba4ac9f132a535efd9d362790b8e1d2b62d900 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Move QtVersionsModel declaration into headerKai Koehne2014-02-071-86/+77
| | | | | Change-Id: Ic61139ef5e8819bb0ae2ba67cfff6b5adc55c14d Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* WelcomPage: Fix intitial filtering by Qt versionThomas Hartmann2014-01-101-1/+1
| | | | | | | | | | | | | | | | When having multiple Qt versions with examples registered in Creator, the welcome mode showed all of them initially. The reason was that m_uniqueQtId was initialized with noQtVersionsId instead of uniqueQtVersionIdSetting(). The function uniqueQtVersionIdSetting() gets the correct Qt version from the settings as shown in the combobox. Task-number: QTCREATORBUG-10790 Change-Id: I9f435f6372f8b0c0495daf6c6efcf4bcc5e70455 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Braces cleanupOrgad Shaneh2013-11-141-6/+3
| | | | | Change-Id: I8413252c90a1487d291f15d92837c30ab697b245 Reviewed-by: hjk <hjk121@nokiamail.com>
* WelcomePage: bug fix for example viewThomas Hartmann2013-10-151-67/+68
| | | | | | | | | | | | We have to wait for all of the QtVersionManager and HelpManager to be initialized, and some data actually being requested from the examples model, before showing any examples. Task-number: QTBUG-33924 Change-Id: I189710374f4af8d7d9cbe4731fa3faafd0623ffb Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* WelcomePage: fixes QTC_ASSERTThomas Hartmann2013-10-101-3/+16
| | | | | | | | | We have to wait for the QtVersionManager until all Qt versions are loaded. Change-Id: Ia6f823660d0252fb8e8ee1b8cfaec32e26ebc0bd Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QtVersionManager et al: Code cosmeticshjk2013-08-301-6/+3
| | | | | | | Apply static 'pattern' for QtVersionManager, de-noise using code. Change-Id: Id66ac90094cd7312d1e72abbdbce4c02b078456e Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* KitManager: Use static API as other singletons doTobias Hunger2013-08-211-2/+2
| | | | | Change-Id: Ia49c6552a5aae72870687ef9c64f2642fbe24155 Reviewed-by: hjk <hjk121@nokiamail.com>
* WelcomePage: fixes for the filter combobox for examplesThomas Hartmann2013-06-171-19/+54
| | | | | | | | | | | "All Versions" did not work correctly and just contributed to confusion. So it is removed. Since we need a sensible default setting we now search for the Qt with the highest version that has examples and demos. Task-number: QTCREATORBUG-9531 Change-Id: I495252a99753ebe511b598c61a79bbb0cd293e40 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Welcome screen: Show real name of kit in examples combo boxKai Koehne2013-06-111-2/+1
| | | | | | | | Show the display name of the kit, instead of computing a generic one out of the Qt version. Change-Id: I9d3700bdd64a686f1761c073a47b57153c2ca10b Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/2.7'Eike Ziller2013-05-031-1/+1
|\ | | | | | | | | | | | | Conflicts: share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
| * WelcomePage: Show demos in the examples viewThomas Hartmann2013-05-021-1/+1
| | | | | | | | | | Change-Id: Idc466b7e058375c0e393eb9f9dd2cc8f58abb2af Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | Clean headers in QtSupport.Friedemann Kleint2013-03-271-1/+0
|/ | | | | | | | Ran script to remove inludes on a trial-and-error basis and manually corrected it. Change-Id: Iac7e32b861d60c4c386f64f065d05a1856e396cf Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Welcompage: allow highlighting of demos and examplesThomas Hartmann2013-02-041-1/+19
| | | | | | | | | | | | With this patch the attribute isHighlighted="true" in the manifest.xml allows highlighting demos and examples. The highlighted demos and examples appear first in the list and have a blue highlight. Task-number: QTCREATORBUG-8459 Change-Id: Ieeb888630235e07b1ae1398c5ccdc3d7e8d15dff Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* WelcomePage: add combox to filer Qt versionsThomas Hartmann2013-02-041-3/+143
| | | | | | | Task-number: QTCREATORBUG-8377 Change-Id: I6693d4ed9cf3791e4cd791463a1b00a23dc4ffff Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Cleanup and simplify ExamplesListModel implementation.hjk2012-12-201-71/+38
| | | | | | | | | | Change-Id: Ie93eefa638560c91aaf83e6878466d97393bde72 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-12-181-0/+2
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: src/plugins/debugger/gdb/gdboptionspage.cpp src/plugins/fakevim/fakevimoptions.ui src/share/share.qbs Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80
| * Update examples when default kit changes.Eike Ziller2012-12-181-0/+2
| | | | | | | | | | | | | | Otherwise one had to close and reopen Qt Creator. Change-Id: If59d5e01665082e0a69e02c686809f92d86180bf Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-12-141-11/+42
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/plugins/qt4projectmanager/qt4buildconfiguration.cpp src/plugins/qtsupport/baseqtversion.cpp Change-Id: I288eeb1137e1b08d6c0d69f394cbb0fe1a937b68
| * More diagnostic messages when debugging examples model.Eike Ziller2012-12-121-9/+28
| | | | | | | | | | | | | | And less messages when not debugging. Change-Id: Ib30dfe061c399aeeb3523544232b394e12ccb1b6 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
| * Do not show examples that do not have a projectPath associated.Eike Ziller2012-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | Tutorials are handled differently, these can still only have documentation or video. Task-number: QTBUG-28396 Change-Id: Ief79756c44633b1d105357b385595a1267f730f4 Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
| * Filter out more invalid examples from the example browser.Eike Ziller2012-12-051-8/+20
| | | | | | | | | | | | | | | | Task-number: QTBUG-28393 Change-Id: I50a1b88c1711f0577843da81c095ebb7ca576077 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-11-301-17/+52
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/editormanager/openeditorsview.cpp src/plugins/debugger/qml/qmlengine.cpp src/plugins/debugger/qml/qmlinspectoradapter.cpp src/plugins/qtsupport/exampleslistmodel.cpp src/plugins/qtsupport/exampleslistmodel.h src/plugins/welcome/welcomeplugin.cpp Change-Id: I92b542af23ceb7cf7dac84b12439e5f819f2dc39
| * QtSupport: Fix crash when inserting from an empty list of examples.hjk2012-11-271-0/+2
| | | | | | | | | | Change-Id: I4dbc796577d77e9bca4e8e76e2f68ada3dd440c0 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| * Resolve demos and examples also relative to qt install paths.Eike Ziller2012-11-271-12/+38
| | | | | | | | | | | | | | | | | | | | Qt5 has the manifest files in QT_INSTALL_DOCS but the actual examples in QT_INSTALL_EXAMPLES/DEMOS, which can be completely independent. The patch tries to resolves files relative to the manifest, and if that fails, relative to the install paths. Change-Id: I7d449e1edab01f18680a5ffe6edcb508e7b194f6 Reviewed-by: hjk <qthjk@ovi.com>
| * Hide non-existing examples.Eike Ziller2012-11-271-5/+12
| | | | | | | | | | | | | | Can be force enabled with environment variable. Change-Id: I262df587cf5a906a9e90850405c9db699c3727ab Reviewed-by: hjk <qthjk@ovi.com>
* | Add whitespace after control keywordsOrgad Shaneh2012-11-281-2/+2
| | | | | | | | | | | | | | | | find -name \*.cpp -o -name \*.h | \ xargs sed -Ei 's/ (for|foreach|if|switch|while)\(/ \1 (/g' Change-Id: I9efdff4bf0c8c01a52baaaeb75198483c77b0390 Reviewed-by: hjk <qthjk@ovi.com>
* | QtSupport: stylehjk2012-11-271-8/+7
|/ | | | | Change-Id: Iabf3c96fc6d6b17282ec2ad43f32f76b04ac2ef0 Reviewed-by: hjk <qthjk@ovi.com>
* Creator Examples: prioritize default Qt version when searching examplesChristiaan Janssen2012-11-221-3/+9
| | | | | Change-Id: Id287332535494dd51609178d429d58749b0c28d6 Reviewed-by: hjk <qthjk@ovi.com>
* Creator Examples: search for manifest files in qt5 submodulesChristiaan Janssen2012-11-221-6/+25
| | | | | Change-Id: Ifd7b838f1471ea08f942d350ed649b0b174e96c5 Reviewed-by: hjk <qthjk@ovi.com>
* Creator Examples: providing custom examples-manifest.xmlChristiaan Janssen2012-11-211-0/+11
| | | | | | | | | The user can prevent the default loading of examples and provide a custom example manifest file through the environment variable QTC_EXAMPLE_FILE Change-Id: Id458d321e2c8815312e338e458a5283ac64b5c95 Reviewed-by: hjk <qthjk@ovi.com>
* Also allow Qt5 to provide example manifests.Eike Ziller2012-10-221-6/+3
| | | | | Change-Id: I71630c7ea8d413949f57797b90672cc3d9b8778f Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* tr()-fixes for 2.6Friedemann Kleint2012-07-261-1/+1
| | | | | | | | | | - 'profile' -> 'target'. - 'qt version' -> 'Qt version'. Fix occurrences in comments as well to make grepping easier. - Placeholders. Change-Id: I451eae2f0571bccf1e75cf0def425a09fa80855b Reviewed-by: hjk <qthjk@ovi.com>