Commit Graph

30 Commits

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