feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
47,290 Commits 108 Branches 368 Tags
6d577f5520070e5087defd44d29afdf1af72bcd5
Commit Graph

72 Commits

Author SHA1 Message Date
Eike Ziller
6ddd0e579f Coding style: Prefer "#pragma once" over header guards 
It's not even "modern" anymore ;)

Change-Id: Id0074f58f6ae669e09168274eab4c3c4ef7359dc
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
 2016-01-26 09:12:17 +00:00
Tobias Hunger
43800a6aa8 Update License according to agreement with Free Qt Foundation 
* Update license in documentation files. Stay at FDL, but update
  URLs as well as license for examples, etc.

Change-Id: I5e8cb5a20f0e9d52fba1d937b7c73197d69dd747
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-01-19 13:09:03 +00:00
Tobias Hunger
d8cd6145c5 WS only change 
Change-Id: I3d2992e73e5625a227d8a78a52fb9e9f786a40a1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
 2015-06-23 13:15:42 +00:00
Nikita Baryshnikov
562f305e6a Coding style: note for static declarations 
Change-Id: I2736f017e412459270c632a6e021db2edb3b6ab7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-06-11 10:18:48 +00:00
Christian Kandeler
046fb9a000 API docs: Fix copy/paste artifact. 
Change-Id: Ia9b3ba12c8fdd6864ffc2e44fda584bf06ef549f
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
 2015-06-10 14:03:42 +00:00
Nikita Baryshnikov
9a40d3c477 Coding style: mention inlined virtual dtors 
in exported classes

Change-Id: I9ff274f05e26baa9d4377f69b0ba441606893357
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-06-08 08:44:28 +00:00
Nikita Baryshnikov
b46cf9aaf5 Coding style: update advice 
to do not use unique_ptr instead of auto_ptr which was deprecated

Change-Id: If6e5bd25c62184a5d34c0cdedf0206138e32bf28
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
 2015-05-27 10:49:12 +00:00
Daniel Teske
c2a2c4c819 Coding guidelines: Add various C++11 features 
Change-Id: I9d3ca28bf8d5d04e04464757420a3c8e30f5dac0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-10 14:21:02 +00:00
Daniel Teske
90e52a4763 Coding Style Lambda: Relax rules on return type 
Every compiler we use already implements C++14 behavior.

Change-Id: I524df4955953e0d2c6de270c3d68915025c331ba
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-03-23 13:24:44 +00:00
Daniel Teske
81ce88cfd0 Coding Style: Update to MSVC 2013, g++ 4.7, clang 3.1 
And add stub texts for scoped enums, initializer list and delegating
constructors.

Change-Id: Ic1f9b97b09fa62b890ea3b7be4f2315ea1a72576
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-03-20 12:23:59 +00:00
Daniel Teske
318e1ca422 Coding Style: Minor tweaks due to scoped enums 
- Clarify that int constants should be unscoped enums.
- Require enum values to duplicate the enum's type only
  for unscoped enums.

Change-Id: Ibf63ada3a925c0fe0a364fd408cedc9638cf4708
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-03-18 16:40:52 +00:00
Eike Ziller
86378da3be Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	src/plugins/debugger/debuggeroptionspage.cpp

Change-Id: I0282d66b16c14877d0131cccbe03573102b48bc3
 2015-03-05 13:28:15 +01:00
Leena Miettinen
53a29f5b83 Doc: fix remaining links to Qt wiki in docs 
Change-Id: Ia9193cf1870241104bf099ad2e47e3ead4eb43fd
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-03-04 10:49:37 +00:00
Eike Ziller
767f0ef58b Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	doc/api/coding-style.qdoc

Change-Id: Id40eb253a2e3e2357276ee76085127da10597bdb
 2015-02-25 10:15:28 +01:00
hjk
4699a33837 Coding style: Allow empty lambda parameter lists to be omitted 
Change-Id: I6d4e53c5e16b1f25db62a4996fcc3b0298abd720
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-02-24 17:26:12 +00:00
Sergio Ahumada
e84770b794 Adapt documentation URL 
Change-Id: I74963a9d4a729450341f4f7a4ae5b3583654ffb8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
 2015-02-18 12:38:23 +00: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
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
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
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
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
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
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
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
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
Eike Ziller
4f0b90dd43 Fix remaining URLs and a few other things that still referred Nokia 
Change-Id: I1c85bae3a1ada7a281fedd6951b35e6a4da395e6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-09 11:10:50 +02:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
Sergio Ahumada
9c2afc4f29 doc: Fix some spelling errors 
Change-Id: I22c0de2d1c5277879fe504764c15a76d1d7f198b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2012-09-21 16:26:19 +02:00
Konstantin Tokarev
32ebcb0297 Coding style: there's no Q_STATIC_GLOBAL. 
Change-Id: Id263db007896ffd26d9e56df2515cb88f4a7dfa9
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-08-08 19:31:12 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
Christian Kandeler
6f5e48be47 Documentation: Fix coding style bug. 
Enum values never ever start with a lower-case letter.

Change-Id: I21171ad424078a18d276d206571ec81cdcd73fe1
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-05-30 11:11:39 +02:00
Eike Ziller
f1d3b432d5 Adapt coding rules for file names to point to the FileName class. 
Change-Id: Ic28c3b0647a353f50c092782ae689ed6173b067b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-05-15 14:18:29 +02:00
Tobias Hunger
2ef2532bf6 Update coding style 
Since Qt modules are changing between Qt4 and Qt5 we no longer
include them when including Qt headers.

Change-Id: I3ed8649faa20b7f7bcd4180c79219f24fdbba026
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2012-05-11 13:50:41 +02:00
Eike Ziller
d66acb51d0 Rename IFile->IDocument and FileManager->DocumentManager 
And adapt the other API respectively.

Change-Id: I1e04e555409be09242db6890f9e013396f83aeed
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-20 13:32:49 +01:00
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
Eike Ziller
d0c0c0628d Start on Creating Plugins documentation. 
Change-Id: Ic75775473cfb405cee5c53b2dc24144dba51a25c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-28 14:52:04 +01:00
hjk
cd0673f787 codingstyle: add namespace rules 
Change-Id: Ib6b3e37376084e2305143e42c85d13ce66ec9f2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-14 10:02:43 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +01:00
Joerg Bornemann
9a191b5b81 Doc: add handling of the preprocessor's "defined" op to coding style 
Change-Id: I3d6e732ad45e3fcceb8d899c28ac4c4a02bb9e23
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-10 13:36:07 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00