Commit Graph

16 Commits

Author SHA1 Message Date
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