Commit Graph

152 Commits

Author SHA1 Message Date
Eike Ziller
56aadc407d Merge remote-tracking branch 'origin/3.3'
Conflicts:
	src/plugins/debugger/watchhandler.cpp
	src/plugins/projectexplorer/kitmodel.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/shared/qbs

Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602
2015-02-12 17:36:29 +01:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
2015-02-12 17:29:21 +01:00
Leena Miettinen
110392ad18 Doc: fix bug in doc building instructions
And add a note about the new online style.

Change-Id: I4d16ea45dd121a27c5c8d8c0fe5e5b971f8c2d05
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-29 13:15:59 +00:00
Tobias Hunger
3956fab1dd Coding style: Fix broken characters
Somebody inserted a fancy version of '"':-)

Change-Id: Ic96d5e821f4c5ad58cec80c6a5225ae24454239a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-01-22 14:19:40 +01:00
Eike Ziller
3c85058694 Update License
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2015-01-16 12:37:56 +01:00
Eike Ziller
b5b47f7df2 Merge remote-tracking branch 'origin/3.3'
Conflicts:
	src/plugins/cppeditor/cppdocumentationcommenthelper.cpp

Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d
2015-01-08 10:38:20 +01:00
hjk
0d9fa1c714 Coding Style: Clarify the use of the Q_OBJECT macro
The old definition sounded like strong but was qualified by an big
'if' at the end, resulting in stating the obvious for a single case
("use it when you need it for qobject_cast").

Having the reminder there is ok, if it is a common thing to forget,
but it should be recognizable as such, and can include "the other
case" where it is typically used.

Change-Id: I0183a12d14c414db9ff8b19598cb9dd22cedda8e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-06 11:35:01 +01:00
hjk
ab1ae75ba7 Coding Style: Mention preference for Qt5-style connects
Change-Id: I7bcae5c87a6588b1817a1f8038471eebeb5ba2b9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-01-05 17:03:03 +01:00
Leena Miettinen
4243c24754 Doc: replace remaining \gui commands with \uicontrol
Missed the Extending Qt Creator Manual the last time I did this.

Change-Id: I33b9b59ef204d0f7c6a5f98665c4839c6646c9b1
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-18 09:31:51 +01:00
Leena Miettinen
ce8ad44692 Doc: fix changed UI string in docs and update screenshot
Change-Id: I1edd879e7389467fbeee0cb0c78c65900a7fa1dd
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-17 17:11:33 +01:00
Eike Ziller
dcb00b00dd Extending Doc: Add warning about what the Qt Creator plugin wizard creates
Because we do not guarantee any source or binary compatibility,
you should use the Qt Creator version that you want to develop for
to create the plugin

Change-Id: I747653f8bbd3df9cc82af7fac67abcf14e786241
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2014-11-25 11:23:22 +01:00
Leena Miettinen
0d9b254840 Doc: remove support for building docs with Qt 4
The templates are fetched from qtbase/doc/global

Change-Id: I15386a66e1dae552f5637062d9f176bf6565a834
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2014-11-24 09:48:26 +01:00
Leena Miettinen
092a924a5b Doc: updated the instructions for writing documentation
Only Qt 5 supported for building docs from 3.3 on.
Added info on using https://tinypng.com to shrink PNG files.

Change-Id: I450c0cf34e34abc54511fef93e8e5caac5ba89ac
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-20 09:38:23 +01:00
hjk
fd8fcd29a1 Lay down current namespace practices
Change-Id: I16e6e292097f3f7289bda8d9c6c23b6827ee54b9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-15 16:34:25 +02:00
Eike Ziller
b5b6a46b4e ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec files
Change-Id: I2b2c704260c613985a4bda179658ec1f8879e70f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-02 15:11:24 +02:00
Eike Ziller
aa6495a261 ExtensionSystem: Remove Qt4 support
Remove usage of the Q_EXPORT_PLUGIN macros, which do not exist in Qt 5.

Change-Id: I678c3cf10b9c5d5c1b9f252b0ecd1c97dc810a47
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-27 08:44:34 +02:00
Eike Ziller
0100237a33 Coding rules: Add guidelines for lambdas and auto
Change-Id: Ie15c848361c8135d83ff3eb20323e51a820b5dbc
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-07-07 09:51:25 +02:00
Eike Ziller
ac31d3c67e PluginManager: Remove hardcoded list of plugins that cannot be disabled
Instead add an optional attribute "required" to the plugin spec. Since
the locator plugin and find plugin are gone, and I don't see a reason to
prevent disabling the text editor plugin, only Core plugin gets the new
attribute set.

Change-Id: I7a380026ea46173cf00afff4213ca1b3a2578434
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-04 08:51:39 +02:00
Orgad Shaneh
2ce5b3bc0b Remove remaining PROVIDER references
Change-Id: I0bfcd7136ec0329cfe15983278c25f6b62415b68
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-26 08:21:14 +02:00
Eike Ziller
d46a73eacf Update "getting and building" page.
With Qt5 private headers are (or can be) installed, so no need to build
Qt yourself.

Change-Id: I58e2eecabbb6c767a583d867167ad17eeb7b6f2a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-05-16 16:42:48 +02:00
Leena Miettinen
d59d8b568d Doc: replace "Mac OS (X)" with "OS X"
Change-Id: I77f1cbbfc17d759d1587caf2a25a53498848e2ca
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-05-06 09:35:45 +02:00
Leena Miettinen
e6fcde78cd Doc: add rules for UI text
Use double quotes if you need quotes.
Use QDir::toNativeSeparators() for file and directory names that you
pass to \c{tr().arg().
Do not use markup that spans the whole string.

Change-Id: I364f5b12d2d9c68c104bf8ff6a12d9e4fbab4514
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-04-17 13:07:24 +02:00
Nikolai Kosjar
1b26e8a21b Doc: Fix typo
Change-Id: I32afc1f8da54e5875edbc0a5cfc62dbbdbec4bcf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-04-03 14:40:46 +02:00
Eike Ziller
b0f5fbc866 Doc: Update first plugin example.
Change-Id: I90405eaba68efa0f6861a54a7283dc062a3d1408
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-31 13:58:48 +02:00
Christian Kandeler
dd20f5e44c Doc: Fix syntax error in coding-style.qdoc.
Change-Id: Ibee52badb902061c36e18b44e9ed71a34ee7a72e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-21 15:46:10 +01:00
hjk
52a903112a Coding style: Add a comment on Aggregation vs Inheritance
Change-Id: Ied68af7f63e34a05a087b80be0f219f9ccd4e8eb
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-02-13 16:59:26 +01:00
hjk
4d96fa7aba Core: Merge Find and Locator into Core plugin
Change-Id: I7053310272235d854c9f409670ff52a10a7add8b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-14 07:43:00 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Christian Kandeler
6448d26ad7 Core: Adapt documentation to recent refactoring.
ProgressManager and ActionManager are no longer retrieved via ICore,
and most accesses do not go via the instance anymore.

Change-Id: Ib0c3033270051aaadfb25e0b2b0eaf7bdec63a1d
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-23 15:10:14 +02:00
Eike Ziller
e11f9e55b5 Add binary compatibility policy to coding style document
Change-Id: Ib70216a555eea0c3bc88d0ab3177839bb11c879d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-21 13:38:08 +02:00
Nikolai Kosjar
b8dbac0b9c Rename "[Mm]ethod(s)" to "[Ff]unction(s)"
Only methods as programming functions are affected. Besides renaming
some actions like "Switch Between Function Declaration/Definition" this
mostly touches (api) code comments.

This is a follow-up patch to commit 872bfb7.

Change-Id: Icb65e8d73b59a022f8885b14df497169543a3b92
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-10 15:56:12 +02:00
Tobias Hunger
0479abdcd7 QDoc: Fix QDoc warnings
This patch fixes ~1100 warnings from qdoc

Change-Id: Ia9555db675acbf8083b2f87d9855a62a3a34ccb9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-09-26 09:56:22 +02:00
Leena Miettinen
872f87f5e9 Doc: fix link to the QDoc Manual
In the Writing Documentation topic of the Extending Qt Creator
Manual.

Change-Id: Iebe960cc878469fb34951a196558d8a7cb22f11f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-09-06 10:28:45 +02:00
Friedemann Kleint
1d56d718cd Add <platform> element to pluginspec-files.
The <platform> element may contain a regular expression
matching the names of the platforms on which the plugin works.

Task-number: QTCREATORBUG-9002
Change-Id: Ic816cfed69a5dd2c4112c976843b9106ba2cbd22
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-05 16:40:24 +02:00
Leena Miettinen
78fc438372 Doc: location of generated help files
Change-Id: Ibd2d6f86cd82e98bf9116bc9d5dc14dec1c6d058
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-07-26 13:47:34 +02:00
Eike Ziller
42c9c96361 Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
	src/plugins/qmlprofiler/qmlprofilerengine.cpp

Change-Id: Ic9dc22d2d4a7306cfc4ef0ec158993e3768a9853
2013-06-14 16:19:14 +02:00
Leena Miettinen
3ac771ecbf Doc: rename index.html as extending-index.html
Remove the \contextpage commands, as they are only used
in some of the files.

Task-number: QTBUG-31106
Change-Id: Iacbf15a33ab6cb426c2fbfb6fbed03310095f2ba
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-06-14 15:55:19 +02:00
Leena Miettinen
68a573b62e Doc: do not link to external pages over https
Replaced "https" with "http" (where redirecting works)
as a workaround for a bug that causes Qt Creator to crash
when trying to open external links using https.

Task-number: QTCREATORBUG-9397
Change-Id: If331eaffd2296a79f6e6f1ee7becd725d2aadb1d
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-05-31 16:01:49 +02:00
Eike Ziller
54b6607b09 Add documentation for variable chooser.
Change-Id: I26da0ec0d092ba83a30a4db156d8e5237ab8f001
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-04-02 17:34:48 +02:00
Eike Ziller
f1741032a8 Add document about plugin manager/object pool.
Change-Id: I60d3a60f2a6933f9b1fe1501bab4dca95dda4d8c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-02 15:42:07 +02:00
Leena Miettinen
a436ffc0b9 Doc: update info about building the docs
Change-Id: I80de9d6b13e286f9eb95efc69b5b4b5256541f2f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-02-28 15:52:49 +01:00
Leena Miettinen
7f6405c46a Doc: taking screen shots
Change-Id: I8b0be0e822efcd538e5642bdf33b06016294748d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-02-28 15:52:37 +01:00
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
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
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
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
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
d5fd3b5dd8 Remove unused classic.css
Change-Id: Id4b5a2bbf3d6498b1439abbb6fe204bd3db39620
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-08 18:32:37 +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