| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: Iba3da7fb1d45630e0986a83ef004e5b9b08fb0c7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: I64563971749ab47d0f144bd90fbd22558783fc55
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
|
|
|
|
|
| |
Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: Ib3b4b2379999061b04923b98044ed83743cd6423
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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 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>
|
|
|
|
|
| |
Change-Id: Ia4c73a0e9985e968265d7698e3a0a3cc58dc7aaa
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
|
|
|
|
|
| |
Change-Id: I79ba4ac9f132a535efd9d362790b8e1d2b62d900
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
|
|
|
|
|
| |
Change-Id: Ic61139ef5e8819bb0ae2ba67cfff6b5adc55c14d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
| |
Change-Id: I8413252c90a1487d291f15d92837c30ab697b245
Reviewed-by: hjk <hjk121@nokiamail.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Apply static 'pattern' for QtVersionManager, de-noise using code.
Change-Id: Id66ac90094cd7312d1e72abbdbce4c02b078456e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
|
|
|
|
| |
Change-Id: Ia49c6552a5aae72870687ef9c64f2642fbe24155
Reviewed-by: hjk <hjk121@nokiamail.com>
|
|
|
|
|
|
|
|
|
|
|
| |
"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>
|
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
|
| |
| |
| |
| |
| | |
Change-Id: Idc466b7e058375c0e393eb9f9dd2cc8f58abb2af
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
|
|/
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Task-number: QTCREATORBUG-8377
Change-Id: I6693d4ed9cf3791e4cd791463a1b00a23dc4ffff
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ie93eefa638560c91aaf83e6878466d97393bde72
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/debugger/gdb/gdboptionspage.cpp
src/plugins/fakevim/fakevimoptions.ui
src/share/share.qbs
Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80
|
| |
| |
| |
| |
| |
| |
| | |
Otherwise one had to close and reopen Qt Creator.
Change-Id: If59d5e01665082e0a69e02c686809f92d86180bf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
src/plugins/qtsupport/baseqtversion.cpp
Change-Id: I288eeb1137e1b08d6c0d69f394cbb0fe1a937b68
|
| |
| |
| |
| |
| |
| |
| | |
And less messages when not debugging.
Change-Id: Ib30dfe061c399aeeb3523544232b394e12ccb1b6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-28393
Change-Id: I50a1b88c1711f0577843da81c095ebb7ca576077
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
Change-Id: I4dbc796577d77e9bca4e8e76e2f68ada3dd440c0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
Can be force enabled with environment variable.
Change-Id: I262df587cf5a906a9e90850405c9db699c3727ab
Reviewed-by: hjk <qthjk@ovi.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|/
|
|
|
| |
Change-Id: Iabf3c96fc6d6b17282ec2ad43f32f76b04ac2ef0
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
| |
Change-Id: Id287332535494dd51609178d429d58749b0c28d6
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
| |
Change-Id: Ifd7b838f1471ea08f942d350ed649b0b174e96c5
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I71630c7ea8d413949f57797b90672cc3d9b8778f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
|
|
|
|
|
| |
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
- '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>
|