feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
32,973 Commits 108 Branches 368 Tags
cf5ec760f61522ce0387b5ea44b017459c200ab8
Commit Graph

44 Commits

Author SHA1 Message Date
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
Eike Ziller
cfb8417dec Adapt to new project location. 
Change-Id: I13de0363d36095faa2554c5b41cdb7fb3e7c42f2
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-26 15:41:35 +02:00
Eike Ziller
09cf26eb24 Some corrections about our binary compatibility. 
Change-Id: Ic54b7f7a2f574a6be9caeefa64912bb9e0cc11fb
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-24 13:31:38 +02:00
Eike Ziller
9e0fc18fba Add some info about namespaces 
Change-Id: I6e3c2900b3f3c96e4b9f6657f9371fd728e5bd91
Reviewed-on: http://codereview.qt.nokia.com/3722
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-08-29 12:11:17 +02:00
hjk
aaf4224f86 doc: specify d-pointer rules 
Change-Id: I33d9d990ad9da06a76690de4d8aa16ca0692dc65
Reviewed-on: http://codereview.qt.nokia.com/1233
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-08 09:04:10 +02:00
hjk
a322bd606f Replace qt-info@nokia.com with info@qt.nokia.com 
Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018
Reviewed-on: http://codereview.qt.nokia.com/1187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-06 11:14:01 +02:00
Friedemann Kleint
d411933fe6 Documentation: Clarify global variables. 
Rubber-stamped-by: hjk

Change-Id: Ic5d8a50deeee93572d838725d1cf4d2af6245c0f
Reviewed-on: http://codereview.qt.nokia.com/510
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-20 14:15:47 +02:00
Leena Miettinen
7604cd755a Doc: change link target from Gitorious to Qt developer wiki 2011-05-06 17:06:55 +02:00
Leena Miettinen
cea0678bce Doc: edit grammar and style 2011-05-06 17:06:53 +02:00
Leena Miettinen
1998afc41f Doc: add doc project for the Extending Qt Creator Manual 2011-04-27 17:35:58 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2' 
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
 2011-04-14 12:39:31 +02:00
hjk
c06ca69aa1 coding style: prefer 'class' over 'struct' for consistency reasons 2011-04-14 11:15:08 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
hjk
e73f43c759 coding-style: mention virtual inheritance 2011-03-21 15:08:36 +01:00
Leena Miettinen
57df73112f Doc: fix links 2011-02-18 17:26:40 +01:00
Leena Miettinen
96fde308d3 Doc: fix typo and us US spelling 2011-02-11 14:16:14 +01:00
Leena Miettinen
a2b7700250 Doc: fix example code 
Reviewed-by: Christian Kandeler
 2011-02-11 14:16:13 +01:00
Leena Miettinen
5a6aa4bba0 Doc: edits to language and style 
Removed duplicate info.

Reviewed-by: hjk
 2011-02-10 16:51:42 +01:00
hjk
8a2aab79e9 coding style: incorporate some of the Qt guide lines 2011-02-04 15:16:55 +01:00
hjk
517662c83e dcoding-style: some reformatting and minor additions. 
[Like splitting complex 'if']
 2011-02-04 12:45:33 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
d4da72e5c0 Documentation links. 2011-01-06 10:40:58 +01:00
con
e624c3fbe6 Coding style & patterns 2011-01-05 14:39:19 +01:00