feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
61,421 Commits 108 Branches 368 Tags
005e7aa54de0932323e44f752a4b51a421d0dc7d
Commit Graph

1571 Commits

Author SHA1 Message Date
Eike Ziller
e2b0835b58 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	src/plugins/analyzerbase/startremotedialog.ui
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qt4projectmanager/makestep.cpp

Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1
 2011-11-25 09:48:25 +01:00
Leena Miettinen
02bbf4ff9b Doc: rewrite getting started topic 
New structure and images.
Create a new page for tutorials.

This should have actually been part of the previous commit
"resolve merge conflicts".

Change-Id: I2138569c551fa55a978ee4ac4554544b04a671e4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-24 15:30:19 +01:00
Leena Miettinen
b7692adbd6 Doc: resolve merge conflicts 
Change-Id: I76f544e86acd903864e301c798048f95d62b79a3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-24 10:23:48 +01:00
Leena Miettinen
401a76fbaa Doc: import statement in new project wizard 
New Qt Quick application wizard now imports Qt Quick 1.1.

Change-Id: Id1433364b29a5f23d351d4cd07cc22e69b52f67c
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-11-22 16:03:48 +01:00
Eike Ziller
fbd47e25ee Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	qtcreator.pri
	share/qtcreator/templates/qtquickapp/main.cpp
	src/plugins/analyzerbase/analyzermanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: I3be78f22e7301d61a9c7fc142cbc34a3cebc2cf4
 2011-11-18 10:16:49 +01:00
Leena Miettinen
2cb9ad9c6d Doc: update images 
Change-Id: Ic298b3fb77589373fe5d70c6b44d0e73d76a7ed9
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-17 09:33:36 +01:00
Leena Miettinen
b2987e3c2d Doc: fix macro 
The macro points to the wrong visual editor.

Change-Id: I2663fdac1789f0701669fb1d4bcbc4272beb7bfe
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-16 17:01:01 +01:00
Kai Koehne
7450284ebe Improve documentation for debugging Qt Quick 
Change-Id: I70a9aa2f41b0761bccb895039fd9d82b8d30d12f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-16 15:48:50 +01:00
Leena Miettinen
cf82deb096 Doc: Qt SDK 1.1.5 contents 
Change-Id: Id1de9b0cbc4880a90415d4cc0aa8297b2bc51a24
Reviewed-by: Aleksi Uotila <aleksi.uotila@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-16 15:24:21 +01:00
Leena Miettinen
803c012e62 Doc: add example code to the tutorial 
Task-number: QTCREATORBUG-6540
Change-Id: I4b5f7e73ee49e03621a9461d037e13c251959e84
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-11-16 13:21:12 +01:00
Leena Miettinen
bb48e072be Doc: reflect change in the UI 
Update text and screenshots after the Link QML debugging library
check box label was removed and Enable QML debugging label is
always used.

Task-number: QTCREATORBUG-6541
Change-Id: Id53f5db2b9007a2e3c7b939cae61073b519fdb18
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-16 12:07:29 +01:00
Leena Miettinen
4f20954a22 Doc: QML Profiler remote option 
Change-Id: I094aac57640588f1bc8f73b36217273b9736a3cf
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-15 16:58:08 +01:00
Leena Miettinen
f7915e4175 Doc: specifying analyzer settings at project level 
Change-Id: Ic0d68dbaf3a1b57a56b3e2cb2670399460df8589
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-15 16:08:27 +01:00
Leena Miettinen
27258e4ea4 Doc: restoring global changes 
Change-Id: I6d377a5ab5a03b1b52761b2c99edf3425e786ce1
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2011-11-15 16:03:14 +01:00
Leena Miettinen
7a8b2caef4 Doc: add a missing step 
Change-Id: Ie9372a2fe2f4a1451e1aa6cd86abc5cde588355d
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-11-15 15:35:23 +01:00
Leena Miettinen
646b2f4e6e Doc: add steps to select components 
Users now have to know which components to import.

Change-Id: I70afdc7dc15055f166074e5807d3e2ee2dd0b2f4
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-11-15 15:13:32 +01:00
Leena Miettinen
9f4a83a681 Doc: fix next and previous links 
Change-Id: I35444783de4cd6fcbdd622dc783cf20b99b82c8f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-14 17:56:30 +01:00
Leena Miettinen
58001c4043 Doc: remove tutorial and example 
Using Qt widgets to create UI for mobile applications is not
recommended.

Task-number: QTCREATORBUG-6484
Change-Id: I6d1f267bcf8da5864d8df73ca03bd48f4f7581ad
Reviewed-by: Aleksi Uotila <aleksi.uotila@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-14 17:29:40 +01:00
Leena Miettinen
2d1e1fb864 Doc: update and remove screenshots 
Change-Id: Ia6c47f1b0d66616cc90b7f222556fbd3746a9b29
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-14 15:47:59 +01:00
Leena Miettinen
f7a3fde127 Doc: project is re-built only if files changed 
Change-Id: I5c5cd76a2a138c442c9f0138e8c562a7bbaf00bd
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-11-14 14:07:59 +01:00
Daniel Teske
23290e4df0 Add known crash with 4.7.4 && g++ 4.6 to known issues 
Change-Id: Ib84245e781673aa7850158479d70336ac4704edf
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-11-11 16:02:02 +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
Leena Miettinen
915770d31e Doc: add known GCC issue 
Change-Id: I4e200f2b54b3d4c7ea0843263fb3addcb98bad14
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-10 12:00:24 +01:00
Leena Miettinen
67ec1f55e3 Doc: fix list formatting 
Change-Id: Ia5b8d6f83df5dd5456a49319b3e292af0a094ca3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-08 16:56:58 +01:00
Leena Miettinen
08e1343bdc Doc: advertise tips and tricks 
Change-Id: Id0d89a840806ca5f66925652adb5d7346d23b354
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-11-08 16:45:29 +01:00
Leena Miettinen
040132841d Doc: rename Ovi Store as Nokia Store 
Task-number: QTCREATORBUG-6469
Change-Id: Ib2c2e5c02cafff4978cafa01a2b4a9d73a3f1cd6
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-11-07 15:33:19 +01:00
Leena Miettinen
fd18d4fad0 Doc: add missing step 
Task-number: QTSDK-1053
Change-Id: I5d0924e51075116f8a77779372b7e93371af0b71
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-11-07 15:33:07 +01:00
Leena Miettinen
002890faba Doc: fix shortcuts for modes 
Change-Id: I9af5a84aa970c36fa7d6d95cd072bba5b5462faa
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-11-04 15:59:04 +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
Leena Miettinen
a1cf3a264d Doc: changes in the Welcome mode 
Change-Id: Ia7168e0f7065c4895e461429b9d2e6af967eb808
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-11-02 22:47:23 +01:00
Eike Ziller
912cd548c0 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/madde/maemopackagecreationstep.cpp
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp
	src/plugins/qmljstools/qmljsqtstylecodeformatter.h
	tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp

Change-Id: I63ab2ba5dac006c37ccfbae55b023396a4676ff7
 2011-11-01 18:16:38 +01:00
Liang Qi
c937f52929 Update the description for FSF gdb on Mac OS X 
Change-Id: I3b228680f825e4c675541476e4e86d1d068d2037
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>
 2011-11-01 15:52:14 +01:00
Leena Miettinen
002820867c Doc: help browser does not allow file download 
Task-number: QTCREATORBUG-6339
Change-Id: I28e32df3ef5ae0846349baa140c12230f9e8451d
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
 2011-11-01 15:42:13 +01:00
Leena Miettinen
37720c4008 Doc: update example to use Qt Mobility API 1.2 
Task-number: QTCREATORBUG-6270
Change-Id: I2c65d7ec2df856ed0145468be1497b7dc5ac76a1
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-01 13:49:11 +01:00
Leena Miettinen
85f2571c35 Doc: rename Symbian^3 and Symbian^1 as Symbian Anna and S60 5th Edition 
Reflect changes in targets installed with the Qt SDK 1.1.4.

Add information about advanced development with Symbian SDK.

Task-number: QTCREATORBUG-6051
Change-Id: I28715cbb11a8088630ce4de5d0756ede2ca1d96e
Reviewed-by: Tim Kelly
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-01 10:29:33 +01:00
Leena Miettinen
19ea22a2ac Doc: update screenshots and make text clearer 
Task-number: QTCREATORBUG-6154
Change-Id: I90afe4693d34ff3061c214673b0e3a04b548e528
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-10-31 14:12:37 +01:00
Leena Miettinen
adec0ae5bb Doc: sharing project settings 
Change-Id: Ibd1b35244346a9c868fe0a2b011085c234a6c4e1
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-10-31 11:54:55 +01:00
Leena Miettinen
7348291514 Doc: Layout in Column, Row, Grid, or Flow 
Change-Id: Ic1613e4017a3ff038e235530668afb97f80a31d0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-10-20 09:52:03 +02:00
Leena Miettinen
40044d80fe Doc: Go into Component function 
Change-Id: I2be678a463370730ebdb9497c30da3b90dbbf931
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-10-20 09:31:06 +02:00
Leena Miettinen
1430868d3b Doc: update the path to locator options. 
Fix typos and update screenshots.

Task-number: QTCREATORBUG-6307
Change-Id: Ie015fd50c437519e41e96f63a91894a1f730c662
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-19 12:06:28 +02:00
Leena Miettinen
515033122f Doc: Maemo Qemu Emulator was renamed MeeGo Qemu Emulator 
Update screenshots

Change-Id: I24ed8955ebfe7a35bb0dafcb2bd4f0c4b81c7355
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-10-18 15:28:15 +02:00
Leena Miettinen
3dbe54b0fe Doc: move options to a new Build & Run category 
Move General settings (from Projects) Tool Chains, Qt Versions,
and CMake settings

Task-number: QTCREATORBUG-6327
Task-number: QTCREATORBUG-6326
Task-number: QTCREATORBUG-6307
Change-Id: I87b2238ac0b44f56363c85366157ae70ac694211
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-18 11:56:01 +02:00
Leena Miettinen
33e8707ae7 Doc: must use Qt Quick Components when developing for MeeGo 
Change-Id: I6ab99cc159a16243f334be06fe9d46aa00c50faa
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
 2011-10-17 10:50:46 +02:00
Leena Miettinen
f85d8ba445 Doc: fix bug 
Task-number: QTCREATORBUG-6311
Change-Id: I99089d0ec7eb95a007fa21ab41d76da280472975
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-10-14 15:58:36 +02:00
Leena Miettinen
7bde24aa87 Doc: shortcut to check JavaScript code syntax 
Change-Id: Ifb726f6739a572b927a43065a55986fef0b73c92
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-14 13:26:06 +02:00
Daniel Teske
bfd644bcf4 Fix documentation for custom project wizard. 
Task-number: QTCREATORBUG-6077
Change-Id: I83e1fc18131992d81aa4e4e5e201ede66d4e6368
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-10-14 13:25:07 +02:00
Leena Miettinen
a2deab607c Doc: Issues pane filters 
Rename Build Issues to Issues

Change-Id: I6aa6116e8cdaf0f1d9f201335bfebedddca7c237
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-14 13:10:21 +02:00
Leena Miettinen
d723e19765 Doc: QML and C++ 
Change-Id: Ic0d5906cdd16a08196d4240265f4179a93936f5e
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-13 14:40:27 +02:00
Leena Miettinen
933afd9264 Doc: semantic highlighting for JavaScript 
Change-Id: If5dfce9581fbbde3d5553f159bc0dd46ce30a5b2
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-13 09:58:58 +02:00
Leena Miettinen
d3a9e76c7e Doc: finding QML components with Find Usage 
Change-Id: I66565602b9d63897f32bcb20bf68f9077d42fc54
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-12 14:45:43 +02:00