Commit Graph

654 Commits

Author SHA1 Message Date
Eike Ziller
99ba300ae3 Merge remote-tracking branch 'origin/2.3'
Conflicts:
	qtcreator.pri
	src/libs/libs.pro
	src/plugins/debugger/watchwindow.cpp
	src/plugins/remotelinux/maemopackagecreationstep.h

Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
2011-08-10 16:03:57 +02:00
Robert Loehning
476338a6d2 Changed links to bugtracker to https
Change-Id: I62aa9a4033399ee7fc0b55952613657f124c8fb9
Reviewed-on: http://codereview.qt.nokia.com/2791
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-08-10 13:44:03 +02:00
Kai Koehne
7c31bd6604 QmlCpp Debugging: Only set C++ breakpoints after QML is connected
If one hits a C++ breakpoint before the QmlEngine is properly set up
the debugging actions are all disabled. Patch 58faedc4e tried to
fix this by automatically executing continue in these cases, but
this let to errors on Mac OS X. Instead just delay the setting of
C++ breakpoints.

Task-number: QTCREATORBUG-5681
Change-Id: I149dea9b453ed7abd33a1a93b5b546d7c6cda8fd
Reviewed-on: http://codereview.qt.nokia.com/2568
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-08-04 10:54:59 +02:00
Oswald Buddenhagen
ae8ac2eb2f Merge branch '2.3'
Conflicts:
	qtcreator.pri
	src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
	src/plugins/remotelinux/maemodeploystepfactory.cpp
	src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp

Change-Id: I195163713145e72df20aec4ac9058f0c9158083e
2011-07-25 13:57:13 +02:00
Leena Miettinen
b7090ef24b Doc: fix the Battery Status example code
Add example source files to the repository and use snippets in the doc.

Change-Id: I7ce13c2d5d0994a92d1b001e19af28aec8049e8e
Reviewed-on: http://codereview.qt.nokia.com/2030
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
2011-07-22 14:59:06 +02:00
Leena Miettinen
1095ad5861 Doc: using Qt Quick Components for Symbian with Qt Mobility
Change-Id: Ie143e560f67cb99b7b4a70736071eefd57a2e381
Reviewed-on: http://codereview.qt.nokia.com/1954
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
2011-07-22 09:15:07 +02:00
Leena Miettinen
5c60f85aee Doc: add FSF GDB to the table that summarizes debugger support
Also add download link.

Change-Id: Iee22f964c03e812e7e9c73fc036c467a657f6ca7
Reviewed-on: http://codereview.qt.nokia.com/1835
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
2011-07-20 14:54:10 +02:00
Leena Miettinen
238f8cd450 Doc: Qt Simulator use case
Change-Id: I62d47a60ad0f6d904bc8717f43e0c6bae8152ee9
Reviewed-on: http://codereview.qt.nokia.com/1820
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
2011-07-19 12:24:40 +02:00
Leena Miettinen
66a13c3db7 Doc: using FSF GDB in Mac OS X
Change-Id: Iacd80e488ac46001bc419f8e37828b09a286a086
Reviewed-on: http://codereview.qt.nokia.com/1816
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2011-07-19 11:41:19 +02:00
Leena Miettinen
72ca2a7a85 Doc: requirements for QML debugging on devices
Task-number: QTCREATORBUG-4420
Change-Id: I0ee9bd7f3a8ce48c11fc18049ebf3b9d6e833b8c
Reviewed-on: http://codereview.qt.nokia.com/1773
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-07-18 17:11:47 +02:00
Leena Miettinen
f2d01e1007 Doc: meaning of blue color in the property editor
Explain how the changes in property values are vizualized
in the Qt Quick Designer Properties pane.

Task-number: QTCREATORBUG-5047
Change-Id: Ib7c2334dfee6295ec54761d2b1d81fc7309ca7c8
Reviewed-on: http://codereview.qt.nokia.com/1701
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-07-15 14:42:14 +02:00
Eike Ziller
e5ca4b3462 Merge remote-tracking branch 'origin/2.3'
Conflicts:
	qtcreator.pri
	share/qtcreator/dumper/dumper.py
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
	src/plugins/valgrind/valgrind.pro
	tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp

Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300
2011-07-15 14:29:07 +02:00
Leena Miettinen
5a9ec44fb4 Doc: changes to Valgrind options
Change-Id: I2b0ab7566582e657225846ee4a3bfc54d9408b57
Reviewed-on: http://codereview.qt.nokia.com/1689
Reviewed-by: hjk <qthjk@ovi.com>
2011-07-15 10:38:34 +02:00
Leena Miettinen
e7abde37b5 Doc: preparing designs for exporting to QML files
Change-Id: I57c7ee4a246db9468e17142a94cb80464a61299e
Reviewed-on: http://codereview.qt.nokia.com/1642
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jens Bache-Wiig
2011-07-14 13:23:15 +02:00
Leena Miettinen
61ee0328be Doc: ListModel and delegate are added automatically to Grid and Path View
Change-Id: I7bf090330555df763b9e3a64ff14caf0ccbb85b4
Reviewed-on: http://codereview.qt.nokia.com/1641
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-07-14 10:28:12 +02:00
Leena Miettinen
7b2163585e Doc: running Valgrind tools remotely
Change-Id: Ic25dcddfa25b3f1d1d059f4c40bb1d6c78225fc2
Reviewed-on: http://codereview.qt.nokia.com/1576
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-07-13 17:31:42 +02:00
Leena Miettinen
0074b502ec Doc: update QML profiler
Change-Id: I62ba5c74585648c8f495602cd4d676d0628de9b4
Reviewed-on: http://codereview.qt.nokia.com/1560
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-07-13 11:38:33 +02:00
Leena Miettinen
94f6c17f96 Doc: Qt Quick Designer enhancements
Stacking order, mark for translation, new buttons, and list view.

Update screen shots

Change-Id: I472ebbf43e53d8dd20d7dc12f5c55ac298ef0e87
Reviewed-on: http://codereview.qt.nokia.com/1448
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-07-12 12:08:39 +02:00
Christian Kamm
51d8f468e4 QmlJS: Remove old 'Rename id' action.
Replaced by superior 'Rename Symbol Under Cursor'.

Change-Id: I0d0367d1297fde37d501266ef7df515256c6abd7
Reviewed-on: http://codereview.qt.nokia.com/1428
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-07-11 15:01:59 +02:00
Leena Miettinen
feb072b235 Doc: rename 'Start Maemo Emulator' button as 'Start MeeGo Emulator'
Change-Id: I09f46476636af1a1fe7d364541492ab9237995fe
Reviewed-on: http://codereview.qt.nokia.com/1404
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-07-11 11:09:01 +02:00
Leena Miettinen
9216598e80 Doc: rename QML Observer as QML Inspector
Also update functionality and screen shots.

Task-number: QTCREATORBUG-5233
Change-Id: I28cbc5205b17af271d5e849525e76a8e198764ad
Reviewed-on: http://codereview.qt.nokia.com/1370
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-07-08 13:49:53 +02:00
Leena Miettinen
63710f04ed Doc: generic Linux device target
Change-Id: I25fef3d823915c1df424da1a6ec7b683d7d38d66
Reviewed-on: http://codereview.qt.nokia.com/1323
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-07-08 12:13:14 +02:00
Leena Miettinen
73a22c90fe Doc: fix typo
Change-Id: I16c400d642aea93145a17fa9c7a6e0b9e68295c5
Reviewed-on: http://codereview.qt.nokia.com/1155
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-07-05 11:56:42 +02:00
Leena Miettinen
9adcb64e64 Doc: fix capitalization of Git
Change-Id: Ibdb109c3e28635e5d7d8f65c9ebb06220926a1c9
Reviewed-on: http://codereview.qt.nokia.com/1078
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-07-04 16:51:34 +02:00
Leena Miettinen
1a1984d14e Doc: Clang and Linux ICC compilers
Change-Id: Ie0fc4a42e225cea4b614c51326548ba6f41f7c90
Reviewed-on: http://codereview.qt.nokia.com/1082
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-07-04 16:50:27 +02:00
Leena Miettinen
568f8eb8c5 Doc: App TRK support removed
Change-Id: Ifc5b701ab47cf16e895868bc55f0af21f4a0e34b
Reviewed-on: http://codereview.qt.nokia.com/1013
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-07-01 16:32:45 +02:00
Leena Miettinen
f6e4ef380b Doc: changes to the Welcome page
Update screen shots.

Change-Id: If007177110d2273bc94b2e90a6335023e8b741e3
Reviewed-on: http://codereview.qt.nokia.com/1000
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-07-01 16:06:19 +02:00
Leena Miettinen
4928ea014b Doc: changes to the Qt Quick Application wizard
(cherry picked from commit a51c9b60306cf789fcd4347e2bb8a4352857183e)

Change-Id: Ia913f2490515fb7155e7805c18e77d25cdc61f43
Reviewed-on: http://codereview.qt.nokia.com/938
Reviewed-by: Carsten Owerfeldt <carsten.owerfeldt@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-07-01 14:17:41 +02:00
Daniel Molkentin
e25d3dab5e docs: Forum Nokia -> Nokia Developer
Change-Id: I80b2150611cca5301282eea05d590e63843a31aa
Reviewed-on: http://codereview.qt.nokia.com/945
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-06-30 15:30:53 +02:00
hjk
fda652a43e debugger: rename gdbmacros* to dumper*
Was mis-named from the beginning.

(cherry picked from commit 2f119dc2f85b28274d47ff635188872d5ed11521)

Change-Id: I4f2e388edfdded117c5b35d3d04bbdc68d77afa4
Reviewed-on: http://codereview.qt.nokia.com/872
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-06-29 10:21:55 +02:00
Leena Miettinen
fa8c621a73 Doc: Valgrind Memcheck changed and Callgrind added
Change-Id: I557e268f8d000f6f53672d0a5f8957672858dbe1
Reviewed-on: http://codereview.qt.nokia.com/779
Reviewed-by: hjk <qthjk@ovi.com>
2011-06-27 17:22:31 +02:00
Leena Miettinen
843db69441 Git: Document remote and branch dialogs
Change-Id: I8b244b68ea6bca5118f5be8c1116d6eeec3e49bd
Reviewed-on: http://codereview.qt.nokia.com/761
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-06-27 12:35:47 +02:00
Leena Miettinen
bcb46f3ebb Doc: Analyze mode and QML profiler
Change-Id: I8edbcfc43caf312da05248c86ca6ad41733e941b
Reviewed-on: http://codereview.qt.nokia.com/731
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-06-27 09:22:35 +02:00
Oswald Buddenhagen
1d78e594d8 Merge branch '2.2'
Conflicts:
	qtcreator.pri
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
	src/libs/qmljs/qmljsdocument.cpp
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/libs/qmljs/qmljslink.cpp
	src/plugins/cppeditor/cppquickfixes.cpp
	src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp
	src/plugins/qmldesigner/qmldesigner.pro
	src/plugins/qmldesigner/symbianplugin/symbian.metainfo
	src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h

Change-Id: Id5f754e2837a3bb3e0687ed09f1dda45fd0c5617
2011-06-23 19:47:50 +02:00
Leena Miettinen
24131890e6 Doc: add Nokia N9 and update Harmattan info
Change-Id: I5c1b88b18571530c5663bbecc2d4edd17d733dea
Reviewed-by: Christian Kandeler
Reviewed-on: http://codereview.qt.nokia.com/641
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-06-23 10:53:34 +02:00
Leena Miettinen
a6c0ce3c65 Doc: Harmattan target
Reviewed-by: Christian Kandeler

Change-Id: Ica62fc3f04bbc4b0fea84ff44399ac12ea44c0da
Reviewed-on: http://codereview.qt.nokia.com/587
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-06-22 10:46:58 +02:00
Kai Koehne
03e6c940d0 QmlDebugging: Document that debugging only works with wizard
Change-Id: I05b657bccdf712c9df0b825133ec4ae03bcc7bb2
Reviewed-on: http://codereview.qt.nokia.com/475
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-06-21 17:14:52 +02:00
Leena Miettinen
16ae1d7324 Doc: indenting code in the list of topics related to coding
Change-Id: I0c30c04f75649a34b8d68a79c96a3e155cdb2ab2
Reviewed-on: http://codereview.qt.nokia.com/322
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
2011-06-03 13:45:12 +02:00
Leena Miettinen
189058eacd Doc: technical support links
Links are now in the Manual, because they will be removed from the Welcome page.

Change-Id: I0845d6c909ce199c0145baac187cd0eedc55a912
Reviewed-on: http://codereview.qt.nokia.com/247
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-05-31 15:15:52 +02:00
Leena Miettinen
c58e84f279 Doc: code style settings
Change-Id: Ib745a367b4e0cd53679a6f5463e2b4b4c83318a1
Reviewed-on: http://codereview.qt.nokia.com/214
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
2011-05-31 15:14:48 +02:00
Oswald Buddenhagen
c2f2b9d430 Merge remote-tracking branch 'origin/2.2'
Change-Id: Ia0b356840212aec92e712eb4c905f97a1c1dc53f
2011-05-27 11:35:20 +02:00
Leena Miettinen
dad6937e23 Doc: selecting Qt version when building apps for Symbian for the Ovi Store
Change-Id: I54aadfbafd18601a3b0d6420b8ebb00cb082d803s
Reviewed-on: http://codereview.qt.nokia.com/150
Reviewed-by: hjk <qthjk@ovi.com>
2011-05-26 13:49:58 +02:00
Leena Miettinen
28e0804767 Doc: keyboard shortcuts to turn text into lowercase or uppercase
Task-number: QTCREATORBUG-563
Change-Id: Id91833f068aa56100d2fc2dc95906ef4d08e781d
Reviewed-on: http://codereview.qt.nokia.com/103
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
2011-05-25 12:56:47 +02:00
Christian Kamm
4dcb417c32 Doc: Add notes about QML modules with plugins.
Change-Id: Iabeddf9ddf60c383d2ecdda7ecbb5e930d988684
Reviewed-on: http://codereview.qt.nokia.com/52
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-05-24 08:20:26 +02:00
Leena Miettinen
9f5473e769 Doc: scanning has been removed from Qt Creator.
Change-Id: I439da09a5b0761a95345e54f83f983cb0ddbc01a
Reviewed-on: http://codereview.qt.nokia.com/53
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
2011-05-23 11:30:57 +02:00
Leena Miettinen
79f2122d9f Doc: update setting breakpoints
Update screen shots
2011-05-16 16:56:02 +02:00
Leena Miettinen
186fd07dc7 Doc: rename 'watchers' as 'expressions'
And 'watchpoints' as 'data breakpoints'
2011-05-16 14:27:34 +02:00
hjk
a67fb4b6d3 debugger: change "watchpoint" to "data breakpoint" also in the class docs 2011-05-16 12:39:18 +02:00
Leena Miettinen
a9e085d6b8 Doc: remove redundant paragraph 2011-05-06 17:06:58 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00