feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
80,529 Commits 108 Branches 368 Tags
5e059db065b1680c4f08b901b64f102300eda6e6
Commit Graph

4240 Commits

Author SHA1 Message Date
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
6e20eb7cf4 Doc: update screen shots 
Change-Id: I599626019ddc70c878feeda34c3ef57e76eb2392
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-15 16:59:40 +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
899d9d94fb Doc: update screen shots 
Change-Id: I9f83369be084a3d4d8ba67dae776d1f35044b63e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-14 17:55:50 +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
Oswald Buddenhagen
e61381faba turn doc installation into an explicit target 
otherwise a "make install" without a prior "make docs" will fail.

we cannot make install depend on docs, because the docs target does not
(and cannot reasonably) have proper dependency tracking, so it would be
rebuilt on every install attempt.
we could make install depend on the presence of the docs files without
checking their timestamps, but that would be dirty.

Task-number: QTCREATORBUG-6245
Change-Id: I35a9b8110f8f12760a338b5b100d69e226d3c2e8
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-11-14 15:13:16 +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
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
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
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
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
Oswald Buddenhagen
7f94699d1f adjust fixnavi target to new source structure 
Change-Id: I535ea5632492d1baeabe1a0a8be571d7fe9baba9
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-11-09 17:42:41 +01:00
Oswald Buddenhagen
3830004349 don't get confused by conditionals outside page header 
this adds some state variables, localizes some variables, adds some
assertions and reshuffles some code for clarity.

Change-Id: Idd061fe70e953d3659e7b2b80735d5ec757d5050
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-11-09 17:42:02 +01:00
Oswald Buddenhagen
2ddab351f0 support subdirs 
Change-Id: Ia64e51c28993584e1f24ca8cd1458def242bb391
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-11-09 17:41:44 +01:00
Oswald Buddenhagen
8f4b392e15 document that multiple files are supported 
Change-Id: I7f235e019a80fa5529ec8d0957cdc9090305f0d2
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-11-09 17:41:30 +01:00
Oswald Buddenhagen
40f157951e use warnings instead of -w 
Change-Id: Icce37bf88f36a2da64210cc07e96b8881afec3ab
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-11-09 17:40:52 +01:00
Oswald Buddenhagen
4a322099f5 remove double mention of $SRCDIR/src 
Change-Id: I4627ba8d3be024ab982088fa58ad63c58d086280
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-09 17:40:37 +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
Christian Kamm
a51120b7db QmlJS: Documentation. 
Change-Id: I2a095e38b7d79a5fb39a16d8f32b48c8e28132f6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-11-07 15:16:59 +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
ecfef3c2e1 Doc: fix security issue in HTML template 
Change-Id: I2fbcb030195a9104eeba8b83037623103efdb5c0
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
 2011-10-28 13:16:57 +02: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
Robert Loehning
998281c5c9 "Build Issues" was renamed to "Issues" 
Change-Id: If514e2497a52456bfd16aaebf2a7c83def4621f7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-25 11:57:10 +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
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