feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
21,459 Commits 108 Branches 368 Tags
c8b44dedfb0f1e3682766cf694bf4a1221017e9c
Commit Graph

21459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Koehne
655e6faae8 QmlProfiler: Keep configuration of attach dialog 
Change-Id: If9f4918a77c874c82fec63eacf1464b78b5d82ac
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-10-17 15:05:19 +02:00
Daniel Molkentin
a9eb880353 Remove obsolete file 
Change-Id: Ic59098bbe57c90359d0bf7df8e3b8639a3aaf2d8
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-17 14:04:42 +02:00
Kai Koehne
c548721c1e Debugger: Enable stack frames without an annotated function 
E.g. breakpoints on QML bindings do not have an annotated function.
Still they're valid stack frames you can click on.

Change-Id: I2b9417e6a57b846d74bd5bc661d11027b028c602
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-17 12:23:19 +02:00
Peter Kuemmel
fe80df7e2f Compile with Visual Studio IDE: string macros don't need to be escaped 
Merge-request: 400
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: I81f335b44fe736f3ffc9ba3212de25edf8589dd1
 2011-10-17 11:28:28 +02:00
Christian Kamm
ea24106373 QmlJS indenter: Fix ternary multiline indent. 
Task-number: QTCREATORBUG-6208
Change-Id: I7e5267291bc01226b5339cb4abdbb15856c58477
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-10-17 11:22:34 +02:00
Erik Verbruggen
29dff7221d Fixed stack-overflow when parsing insanely nested compound statements. 
Thanks to Clang's parser_overflow.cpp which has >16000 nested compound
statements to check exactly the same.

Change-Id: I2b604f8ceb01115d7fe950994e0677a081e99481
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-17 11:17:46 +02:00
Eike Ziller
7e3d41da58 Version bump 
Change-Id: I5a5079377d043c30c7aabefb2c11a4437ae6c92c
 2011-10-17 11:02:12 +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
hjk
2c2b3732db debugger: more robust Qt 4 vs Qt 5 detection in dumper 
Change-Id: I2a1eb5181e614899f3cd80e0eaec5be9a3e93c77
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit f626168c62)
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-17 10:26:45 +02:00
Thomas Hartmann
e7c211f9ad QmlDesigner.designDocumentController: fixes update of SubComponentManger 
We have to update the SubComponentManger each time the document changes.

Change-Id: Ifb42e3d6b2e123ef651309144ae8f3bbdbe39eb7
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-10-14 17:22:03 +02:00
Tobias Hunger
829a1d3451 gitignore: Ignore *.autosave 
Change-Id: I53745ec7b446d76600e93c1adfda41a5cda5810d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-10-14 16:15:13 +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
Robert Loehning
befbfec3b1 debugger: Added function to test NULL pointer dereference 
This was removed in 8d2f0376e2

Change-Id: I238ab3d789b0f22fb510cd936a8bf8c07dbb2b8b
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-14 14:52:20 +02:00
Daniel Teske
18d4d20acb Fix detection of Oxygen style 
Change-Id: I2a28335285869ce477d2c71532ccb44046a0cfa7
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-14 14:34:47 +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
Christian Kamm
eabd58139d QmlJS: Fix build with Qt 4.7. 
Change-Id: Ibe239db039bd64892a55805847de61dedad76640
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-14 12:40:16 +02:00
Thomas Hartmann
0945269a10 QmlDesigner.property: fix specialization of property pane 
If a super class has a specifics pane use it and only autogenerate
missing properties.

In ItemPane.qml make sure the autogenerated properties come first.
Fix the template generation. If not code for any property is generated
the template is empty.

Change-Id: Ia93c55cd9f428a5ebea12d0e807a7e9ab185f0bd
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2011-10-14 12:39:39 +02:00
Jarek Kobus
62ea86911f Fix typo 
Change-Id: Iec4d97b55b786d792d978e02955761df0caff2e8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-10-14 12:17:44 +02:00
Thomas Hartmann
1b0d6c3431 QmlDesigner.itemLibrary: fix for desktop widgets 
Use the implicit size.

Change-Id: I97b2e45d5cb6198547f34421ee12a07385a96b2c
Reviewed-on: http://codereview.qt-project.org/6356
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
(cherry picked from commit c176c3155b)
 2011-10-14 10:06:08 +02:00
Jarek Kobus
6a3e065903 Update Polish translations 
Change-Id: Iec9f5f1c7bac531bb5d4df74d867f760b1eca976
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
 2011-10-14 10:00:19 +02:00
Eike Ziller
2a489d4d4d Add missing command line help. 
Change-Id: Ib1f98fa91293478d0f4271f9032e6e3866c81bab
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-14 08:21:25 +02:00
hjk
f7f3c2d151 debugger: don't show warning about release builds on Mac 
Change-Id: Icc0e4c1b3d08d0373ea0401fca5c05b23ccf4aac
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-13 18:24:28 +02:00
Christian Kandeler
5c6e760d0b Harmattan: Support "no Aegis manifest file" case. 
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=284797
Change-Id: I66aa22140362141c36070ab971d2283f60bcb49d
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-10-13 17:46:25 +02:00
Kai Koehne
f5ec093e3b Debugger: Automatically adapt to the languages the running engine supports 
We used to get the layout only from the current/last run configuration. However,
this fails for engines started by other means (Debug->Start Debugging submenu).

Change-Id: I87e12457c7cd68a326ac1827298a3542e149199b
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-13 17:43:57 +02:00
Jarek Kobus
b0a20e1220 Fix typo 
Change-Id: I48babc6f7cae32420d28106f1d82a6aab6f09835
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-10-13 17:30:33 +02:00
Kai Koehne
17ecb5bb71 Debugger: Avoid "Could not connect ... QML debugger" warning for mixed debugging 
There's a race condition between the QML Engine trying to connect after the app printed
"Waiting on debugger port ...", and any possible Cpp breakpoints stopping the app.
Therefore, don't annoy the user with "Could not connec to QML Debugger" warnings
while the Cpp debugger is stepping.

Change-Id: I77f6f98e835e45363c5d47e10b39df249f65a1a3
Task-number: QTCREATORBUG-6249
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-10-13 17:22:44 +02:00
Kai Koehne
60c4160ebd Debugger: Avoid 'start debugging' action being enabled why debugging 
Don't let updateDebugActions() (triggered e.g. by project changes)
mess with the state fo the Start Debugger, Step, Next actions while
an engine is running.

Change-Id: I08ee20c70f9ff712f928f8ba04ac3d60d5669f11
Task-number: QTCREATORBUG-6290
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-13 17:22:13 +02:00
Kai Koehne
be35fecf91 Debugger: Disable stepping from QML->CPP for the time being 
Change-Id: Iafcc460a374bada67609dc1210cc1b787d267bfa
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-13 17:21:58 +02:00
Kai Koehne
f8700f19ae Debugger: Expose which languages (QML, C++, Any) an engine supports 
Change-Id: Ia690b5cda84738c303ae7b6bd579e43313728525
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-10-13 17:21:49 +02:00
Kai Koehne
b8ed8f493f Actually delete CONFIG+=declarative from list of user arguments 
Fix incorrect merge in b0efd44d20 .

Change-Id: I7b007cdaf89732336463685a1af7000584a46e6e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-13 15:28:54 +02:00
Robert Loehning
584a8f016e Squish: Moved remaining functions for creating projects to project.py 
Change-Id: I92b56ed9401be41d0a54dd32c623b55b7d1e4f71
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-10-13 14:58:04 +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
Eike Ziller
16c6c27901 Adapt default window size to larger window borders. 
Also remove old compat settings reading code.

Change-Id: I460322e4ee5167f98ee2c2f258cee956c70e1612
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-10-13 13:57:01 +02:00
Thomas Hartmann
3eed81678b QmlDesigner.contextMenu: fix for layout 
Now the items are properly sorted in the layout.

Change-Id: Ib1d65ef5a67e618f3e42841c92a5f1fce310d67c
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2011-10-13 13:47:30 +02:00
Thomas Hartmann
ed0095ca1e QmlDesigner: crash fix 
instanceParent() can be invalid.

Change-Id: I804879491544500e20426a25515b1997022a102c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-10-13 13:29:15 +02:00
Kai Koehne
b684f662b1 Debugger: Ignore instruction-wise operator mode for stepping QML 
Change-Id: Idfd703acb9876041916cc3b1a04b5c031af2c12b
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-10-13 13:24:33 +02:00
Thomas Hartmann
d0d764ada8 QmlDesigner: changes-2.4.0 
Change-Id: Ie2f20a8b8bcfd0ec7837a6abfb7816756e27d0e2
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-10-13 13:12:53 +02:00
Kai Koehne
d2d3c6dd15 QmlCppEngine: Make sure that breakpoint markers get removed 
resetLocation() called by DebuggerPlugin::handle* should automatically
reset the locations for stepping etc.

Change-Id: I3e20f93ade7f40e1e1f33b1b48b11522b59771f8
Task-number: QTCREATORBUG-6291
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-10-13 11:56:10 +02:00
Christian Kamm
a15e3a3e90 QmlJS: Fix QUrl completion with Qt 4.8. 
QUrl no longer treats scheme-less urls as local files.

Change-Id: Ie219985d653a692937ff9a5ebbafc455cd3dca13
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-10-13 11:16:33 +02:00
Christian Kamm
465d0944d3 Update 2.4 changelog for C++ and QmlJS changes. 
Change-Id: I3f09460a125469504fe4ecf7124b71fa1f068e17
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-13 10:57:46 +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
Joerg Bornemann
4524ce2ce5 changes-2.4.0 updated 
Change-Id: Icbbb01f9b56f0e3d41da5ec2e0cd09c84162aff0
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2011-10-12 18:43:45 +02:00
Thomas Hartmann
d605936986 QmlDesigner: fix typo 
Change-Id: If02d4ae2c5c3dddd877fef80af6eebcd10914b5a
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-12 16:50:15 +02:00
Kai Koehne
9ae35f7972 Task Pane: Sort list of filters alphabetically 
Change-Id: Ife88fd800da42d45c859a5637bfa4259f898add2
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-12 16:14:55 +02:00
Kai Koehne
55ebeddb1c FileInProjectFinder: Fix gcc warning 
Change-Id: If58d9e84b34fbc2cbe755fb0d1492e305d4eadd1
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-10-12 14:59:20 +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
Kai Koehne
9fb498a76c DebuggerMainWindow: Fix issues with default layout 
Make sure all docks are properly tabified, even when not visible.

Change-Id: I4c7eb0016d95c8c75d63db939569e6d9e32e57ae
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-10-12 14:37:06 +02:00
Kai Koehne
45b642cb08 Debugger: Remove commented out code 
Change-Id: I17ecaed325cb362fad008a77533dafc442a0209e
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-10-12 14:37:02 +02:00