Commit Graph

2456 Commits

Author SHA1 Message Date
Oswald Buddenhagen
853194370f use qt's qdoc templates when building against qt5
Change-Id: Id49e7808b0e8e83c54d573766fcb8c25bfe6728b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-02-15 11:35:22 +01:00
Leena Miettinen
6b1c306b13 Doc: adding custom compilers
Change-Id: I96827283dc1318ef74452026d2306b6f32ca72b5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-02-15 10:56:06 +01:00
Leena Miettinen
dc31eda337 Doc: rearranged QML JS syntax check messages
Moved a message to its correct place (numerical order)
in the table and added a link to a related message.

Fixed wording of two messages that were changed.

Change-Id: I1c6b8148824eab7d27a118de9327e8658f882bd5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-15 10:33:18 +01:00
Leena Miettinen
e29e8d3b16 Doc: put QML snippets back to text
A workaround for problems in handling QML snippets.
Remove the snippet files.

Change-Id: Id0f445c031e740eafffd8098b44672c771634eab
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-15 09:28:16 +01:00
Leena Miettinen
5686983e95 Doc: new QML syntax check messages
Change-Id: Id0090e02b98592ab2a43f997590cbae6493f1279
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-14 15:56:45 +01:00
David Schulz
6ef0cf1a30 Editor: Refactor Open Link in Next Split.
Cleanup code and added shortcuts and menu entries for
- open header/source in next split
- follow symbol under cursor in next split
- open declaration/definition in next split

Change-Id: I2c4347749d26669d88b7c2968f30f60710f442b1
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-02-14 09:46:16 +01:00
Leena Miettinen
8a0bf72820 Doc: fix special character that was not rendered correctly
Use a dash, instead.

Change-Id: I6d4e260a24973429d3923a5f5f9f34dd3b6d5277
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-02-07 14:40:40 +01:00
Leena Miettinen
2e94fc9487 Doc: making in-source builds the default option
Fix capitalization of the new UI string.

Change-Id: Iaf1dd279639936cb59aa658834c71a49ce1398ac
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-07 14:35:26 +01:00
Leena Miettinen
c9e9b8d144 Doc: showing hidden files in File System view in sidebar
Change-Id: Ib2dcfc7b64feee3139d964b72d53648de6408762
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-07 14:35:12 +01:00
Sergio Ahumada
fb3b01d888 Replace com.nokia.qtcreator with org.qt-project.qtcreator
Task-number: QTCREATORBUG-8189
Change-Id: I1c882f55eed901620ef4944bf1789645b7cff34a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-02-07 12:40:37 +01:00
Nikolai Kosjar
608745078d Doc: Document recently added quick fixes.
Change-Id: Ibd8ca7b8f87e541c189b2631dcd2f07026035550
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-02-06 12:21:30 +01:00
Leena Miettinen
281eb3d414 Doc: adding notes to bookmarks.
Fix capitalization of the new UI text.

Change-Id: Iedca6d494efad25f71a6143dd353dc369d93bec5
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-02-06 11:43:44 +01:00
Leena Miettinen
419c6de735 Doc: replace deprecated QDoc commands
The \i and \o commands were replaced with \li and
\bold was replaced with \b in QDoc for Qt 5.

The \input command was replaced with \include in the docs.

Change-Id: I257d1bebb8ebc739ca20e0d29fcf0406ecb14534
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-06 09:44:18 +01:00
Oswald Buddenhagen
276320caac make doc generation work cleanly with both qt4 & qt5
qdoc does not expand variables in include() statements, so we need to
use separate top-level "switch" files.

Change-Id: I3152baa36cb3dee055abdc68c046b445f92e1fb9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-02-06 09:40:03 +01:00
Oswald Buddenhagen
89efd76c2c de-duplicate qdoc command construction
Change-Id: I83de381cbbee9a04432aeccbb202a13f746ef97e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-02-05 12:38:24 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
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
2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Oswald Buddenhagen
f1cec4629e Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/libs/utils/tooltip/tips.cpp
	src/plugins/coreplugin/versiondialog.cpp
	src/plugins/projectexplorer/kitinformationconfigwidget.cpp
	src/plugins/qnx/blackberryapplicationrunner.cpp
	src/plugins/qnx/blackberrydeployconfiguration.cpp
	src/plugins/qnx/blackberrydeployconfiguration.h
	src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp

Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
2013-01-29 15:52:36 +01:00
Leena Miettinen
34edc737c7 Doc: deployment settings for generic Linux devices
Change-Id: Id26adb0ea37e258680dd61f9d0b50b8f9c90ef45
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-01-24 10:52:36 +01:00
Orgad Shaneh
b53d398e2c Git: Add context-menu actions for cherry-pick and revert
Change-Id: Ic266fe039423a37df2fc347ead7530322ac47bb8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-23 18:50:45 +01:00
Leena Miettinen
75f1e8a66f Doc: fix missing snippets
Add the path to the snippets folder to the qdocconf file
and fix the paths in \snippet commands in the source file.

Change-Id: Iebabec6919b580e6d1474685777862200d314a83
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-23 12:42:07 +01:00
hjk
80631f60f8 CodingStyle: Recommend space after //
This codifies the practice we have been following for a
while and has been advertised on the mailing list now.

Change-Id: I25cc41a14586e8f6735a689c53007c2800bee963
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-01-14 17:57:37 +01:00
Petar Perisin
39e9c5ef20 Editor: Allow to open links in a new split.
This changes current behavior while opening links. Link is now opened in
next split by default. If you use CTRL+Click to open links, it will also
open in next split. However, by using CTRL+ALT+click it will open in
current split.

There are two new checkboxes in Tools/Options/Text Editor/Display:
- "Open Links in New Split" - if it is checked, links will not be opened
in current split. However, if document with link is already opened, it
will be used to open the split
- "Force open links in next split" - Links will always open in next
split, even if their document is already opened somewhere else.

Task-number: QTCREATORBUG-8117
Change-Id: Ib99075b55d9e9683ed2c2386767227457de0a3fc
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-01-11 12:48:44 +01:00
Christian Kandeler
110f0d8a9e Introduce new plugin attribute "disabledByDefault".
A plugin might be disabled by default for other reasons than being
experimental, e.g. because it is not expected to be needed by the
average user. This is probably becoming more relevant the more plugins
are added, since we want to keep the start-up time reasonable.

Change-Id: I87927596d5c78e14793c5e8d6f0548eff6b58d59
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-08 13:19:03 +01:00
Eike Ziller
03717cf7ef Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/debugger/gdb/gdboptionspage.cpp
	src/plugins/fakevim/fakevimoptions.ui
	src/share/share.qbs

Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80
2012-12-18 17:42:04 +01:00
Leena Miettinen
c977562bca Doc: remove references to Qt Quick example
Do not use the Clocks example in the tutorial for building
and running, because it is not delivered with Qt 5.

Change-Id: Id3a81cf0ef01d05de1e287ac1e12cc07bdacbaf1
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-12-17 15:06:15 +01:00
Eike Ziller
74e61a6003 Remove Qt 4.8 index.html from qt.index.
That works around an issue with name collision pages in qdoc from Qt5.

Task-number: QTCREATORBUG-8415
Change-Id: I289a80174b006424d54f98410b2635a27258e368
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-12-17 13:57:24 +01:00
Eike Ziller
cf937f09d6 Avoid pulling in "Extending Manual" into Qt Creator manual.
With Qt5, qdoc finds the doc/api/*.qdoc files if the examplesdir points
to doc/, leading to the two toplevel index.html files ending up within
qtcreator.qch

Change-Id: I4ac3c1447c6924c4e292024919d52ddb97e1f8cc
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-12-17 12:47:49 +01:00
Francois Ferrand
058d2e8cb5 Support preserving case when replacing.
When making a case insensitive search, try to keep the string capitalization when doing
the replace:
      - All upper-case matches are replaced with the upper-case new	text.
      - All lower-case matches are replaced with the lower-case new text.
      - Capitalized matches are replace with the capitalized new text.
      - Other matches are replaced with the new text as provided.

Note: this does not work with regexp replace, only plain text.

Change-Id: I87cbc28eb64688bdf3c8c6ec173fcb22f91abcd0
Reviewed-by: Cristian Tibirna <tibirna@kde.org>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-12-14 10:22:41 +01:00
Eike Ziller
a8a33b9a3b Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I288eeb1137e1b08d6c0d69f394cbb0fe1a937b68
2012-12-14 08:20:49 +01:00
Eike Ziller
8c4d86d174 Fix Qt Creator manual style when generating with Qt 5.
The HTML.templatedir is no longer used in Qt 5. Instead, the files
are resolved relative to the referencing qdocconf.
So we set the templatedir to the path of the qdocconf (for Qt 4)
and change the references to be relative to that path.
Also, it's HTML.extraimages in Qt 5, instead of extraimages.HTML

Task-number: QTBUG-28304
Change-Id: I5b253ea9fac5825c49f74460df188a7fca5c89cd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-12-10 13:42:15 +01:00
Eike Ziller
d5fd3b5dd8 Remove unused classic.css
Change-Id: Id4b5a2bbf3d6498b1439abbb6fe204bd3db39620
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-08 18:32:37 +01:00
Eike Ziller
d719eebfdc Merge remote-tracking branch 'origin/2.6'
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
2012-11-30 17:02:35 +01:00
Marcel Krems
297afe3b01 Copy plugins to correct user directory under Unix.
Change-Id: I587154926a5e4bce62984445d7a00547c0b51673
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-29 10:45:58 +01:00
Eike Ziller
ba1d5f2cdf Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/share.qbs
	src/plugins/cpptools/cppchecksymbols.cpp
	src/plugins/texteditor/behaviorsettingswidget.cpp

Change-Id: Ia34060984f9c036b2f28a6411d796d41f55a3e37
2012-11-27 11:50:56 +01:00
Leena Miettinen
204902f5fd Doc: separate extension plugins for Qt Quick 1 and 2
Task-number: QTCREATORBUG-8269

Change-Id: I83dbfa1eb12405c6d9e4609669ecef165b348cf2
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-11-26 11:56:27 +01:00
Eike Ziller
387f5a7006 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/findusages/tst_findusages.cpp

Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63
2012-11-26 10:52:28 +01:00
Leena Miettinen
dd8396ed06 Doc: using QML Scene for Qt 5 and Qt Quick 2
Task-number: QTCREATORBUG-8170

Change-Id: I2d1a2635b1efe820390084d20712c1fd9961276e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-11-20 14:43:54 +01:00
hjk
2e01daa2a0 debugger: adjust reference to startup commands to reality
Change-Id: I4369de839eba8cd30d261b74e89f2363ca815926
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-11-20 14:39:34 +01:00
hjk
2c7f0cb828 debugger: mention drawbacks of using putCallItems in dumpers
Change-Id: I8f93113d54f9a696ca80661efd4d5e11872ea622
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-11-20 14:33:03 +01:00
Leena Miettinen
440b3f49ff Doc: new Qt Quick 2.0 file wizard
Task-number: QTCREATORBUG-8236

Change-Id: Ibffcae0d4b9d25801d23d2fa0d84ed7fe444feb5
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-11-19 16:32:41 +01:00
Michael Brüning
a0974004af Fix pixel issue with external link icons in footer.
Task-number: QTCREATORBUG-7267

Change-Id: I96e38a03c713fc31ffc9cf975f0d6509bd728993
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-11-12 12:00:44 +01:00
Eike Ziller
fe74a9a722 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/cxx11/cxx11.pro
	tests/auto/cplusplus/cxx11/tst_cxx11.cpp
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I3c8351ad35617f56d15b788c8a46d8a6f453ef70
2012-11-09 11:20:10 +01:00
hjk
de1d0532d0 Doc: mention the snapshot view of the debugger
Change-Id: I40837f84b8755e774f1c63ea38337e5b906204ee
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-11-05 13:39:39 +01:00
Leena Miettinen
bbbac40bec Doc: replace shortcut to File Naming options with menu path
The shortcut seems to have been removed.

Change-Id: I1322feb44fb4b62d30c256e53ab056b5210a4ad0
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-31 16:24:57 +01:00
Mitch Curtis
dbd3e2a971 Fix incorrect sentence in New Project dialog.
"[...] this type of projects." should be "[...] this type of project."

Change-Id: Icc6bbb09ce98f453b76aef34b540d0c2db40cdf1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-10-31 12:47:02 +01:00
Eike Ziller
0a1bdf4257 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/share.qbs
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I13bc737c981aaeb615ab1a3571cc8a18f60a7cd6
2012-10-25 10:45:58 +02:00
Jerome Pasion
b28432648d Doc: Making the header consistent with Qt reference documentation.
Change-Id: I2272f577b707ffd2f308924ba01b768c81decaa8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-10-23 12:23:52 +02:00
Leena Miettinen
8b8d104c58 Doc: where appropriate, refer to Qt 4 SDK
The contents of the Qt 5 installation program will differ from those
of the previous Qt SDK (no tool chains for Nokia mobile devices, for
example). To make this clear, refer to the Qt 4 SDK, where appropriate.

Change-Id: Ia6c3ab5fc3edd150fbe5362f85353243860afdb7
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-22 15:38:53 +02:00
Eike Ziller
021b64b5df Merge remote-tracking branch 'origin/2.6' 2012-10-22 11:17:09 +02:00