OSDN Git Service
Leena Miettinen [Fri, 14 Oct 2011 15:12:20 +0000 (17:12 +0200)]
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>
hjk [Thu, 13 Oct 2011 09:41:37 +0000 (11:41 +0200)]
debugger: more robust Qt 4 vs Qt 5 detection in dumper
Change-Id: I2a1eb5181e614899f3cd80e0eaec5be9a3e93c77
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit
f626168c629ed226811d6cfa80e4410fd99ebfba)
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Thomas Hartmann [Fri, 14 Oct 2011 15:18:32 +0000 (17:18 +0200)]
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>
Tobias Hunger [Fri, 14 Oct 2011 10:20:49 +0000 (10:20 +0000)]
gitignore: Ignore *.autosave
Change-Id: I53745ec7b446d76600e93c1adfda41a5cda5810d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Leena Miettinen [Fri, 14 Oct 2011 11:33:17 +0000 (13:33 +0200)]
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>
Robert Loehning [Fri, 14 Oct 2011 12:00:17 +0000 (14:00 +0200)]
debugger: Added function to test NULL pointer dereference
This was removed in
8d2f0376e22c4f7dd15acea9c17ecb4eb2ab9423
Change-Id: I238ab3d789b0f22fb510cd936a8bf8c07dbb2b8b
Reviewed-by: hjk <qthjk@ovi.com>
Daniel Teske [Fri, 14 Oct 2011 11:02:37 +0000 (13:02 +0200)]
Fix detection of Oxygen style
Change-Id: I2a28335285869ce477d2c71532ccb44046a0cfa7
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Leena Miettinen [Fri, 14 Oct 2011 11:12:53 +0000 (13:12 +0200)]
Doc: shortcut to check JavaScript code syntax
Change-Id: Ifb726f6739a572b927a43065a55986fef0b73c92
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Daniel Teske [Tue, 11 Oct 2011 15:35:23 +0000 (17:35 +0200)]
Fix documentation for custom project wizard.
Task-number: QTCREATORBUG-6077
Change-Id: I83e1fc18131992d81aa4e4e5e201ede66d4e6368
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Leena Miettinen [Fri, 14 Oct 2011 10:29:53 +0000 (12:29 +0200)]
Doc: Issues pane filters
Rename Build Issues to Issues
Change-Id: I6aa6116e8cdaf0f1d9f201335bfebedddca7c237
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Christian Kamm [Fri, 14 Oct 2011 10:26:18 +0000 (12:26 +0200)]
QmlJS: Fix build with Qt 4.7.
Change-Id: Ibe239db039bd64892a55805847de61dedad76640
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Thomas Hartmann [Fri, 14 Oct 2011 10:33:24 +0000 (12:33 +0200)]
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>
Jarek Kobus [Fri, 14 Oct 2011 08:36:35 +0000 (10:36 +0200)]
Fix typo
Change-Id: Iec4d97b55b786d792d978e02955761df0caff2e8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Thomas Hartmann [Mon, 10 Oct 2011 14:51:13 +0000 (16:51 +0200)]
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
c176c3155bb184e526a9199e93db5af24f4d9e95)
Jarek Kobus [Fri, 14 Oct 2011 07:47:27 +0000 (09:47 +0200)]
Update Polish translations
Change-Id: Iec9f5f1c7bac531bb5d4df74d867f760b1eca976
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Eike Ziller [Thu, 13 Oct 2011 07:22:28 +0000 (09:22 +0200)]
Add missing command line help.
Change-Id: Ib1f98fa91293478d0f4271f9032e6e3866c81bab
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
hjk [Thu, 13 Oct 2011 16:06:58 +0000 (18:06 +0200)]
debugger: don't show warning about release builds on Mac
Change-Id: Icc0e4c1b3d08d0373ea0401fca5c05b23ccf4aac
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Christian Kandeler [Thu, 13 Oct 2011 15:17:53 +0000 (17:17 +0200)]
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>
Kai Koehne [Wed, 12 Oct 2011 14:30:14 +0000 (16:30 +0200)]
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>
Jarek Kobus [Thu, 13 Oct 2011 15:23:06 +0000 (17:23 +0200)]
Fix typo
Change-Id: I48babc6f7cae32420d28106f1d82a6aab6f09835
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Kai Koehne [Thu, 13 Oct 2011 13:32:42 +0000 (15:32 +0200)]
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>
Kai Koehne [Thu, 13 Oct 2011 11:22:26 +0000 (13:22 +0200)]
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>
Kai Koehne [Thu, 13 Oct 2011 09:06:07 +0000 (11:06 +0200)]
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>
Kai Koehne [Wed, 12 Oct 2011 14:28:33 +0000 (16:28 +0200)]
Debugger: Expose which languages (QML, C++, Any) an engine supports
Change-Id: Ia690b5cda84738c303ae7b6bd579e43313728525
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Kai Koehne [Thu, 13 Oct 2011 12:01:28 +0000 (14:01 +0200)]
Actually delete CONFIG+=declarative from list of user arguments
Fix incorrect merge in
b0efd44d20e9129c40b47ad3715c248962a947b9 .
Change-Id: I7b007cdaf89732336463685a1af7000584a46e6e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Robert Loehning [Thu, 13 Oct 2011 12:29:51 +0000 (14:29 +0200)]
Squish: Moved remaining functions for creating projects to project.py
Change-Id: I92b56ed9401be41d0a54dd32c623b55b7d1e4f71
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Leena Miettinen [Thu, 13 Oct 2011 08:29:02 +0000 (10:29 +0200)]
Doc: QML and C++
Change-Id: Ic0d5906cdd16a08196d4240265f4179a93936f5e
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Eike Ziller [Wed, 12 Oct 2011 08:03:27 +0000 (10:03 +0200)]
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>
Thomas Hartmann [Thu, 13 Oct 2011 11:30:38 +0000 (13:30 +0200)]
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>
Thomas Hartmann [Thu, 13 Oct 2011 11:24:05 +0000 (13:24 +0200)]
QmlDesigner: crash fix
instanceParent() can be invalid.
Change-Id: I804879491544500e20426a25515b1997022a102c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Kai Koehne [Thu, 13 Oct 2011 09:10:25 +0000 (11:10 +0200)]
Debugger: Ignore instruction-wise operator mode for stepping QML
Change-Id: Idfd703acb9876041916cc3b1a04b5c031af2c12b
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Thomas Hartmann [Thu, 13 Oct 2011 11:09:11 +0000 (13:09 +0200)]
QmlDesigner: changes-2.4.0
Change-Id: Ie2f20a8b8bcfd0ec7837a6abfb7816756e27d0e2
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Kai Koehne [Wed, 12 Oct 2011 15:26:18 +0000 (17:26 +0200)]
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>
Christian Kamm [Wed, 12 Oct 2011 11:47:27 +0000 (13:47 +0200)]
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>
Christian Kamm [Thu, 13 Oct 2011 08:55:20 +0000 (10:55 +0200)]
Update 2.4 changelog for C++ and QmlJS changes.
Change-Id: I3f09460a125469504fe4ecf7124b71fa1f068e17
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Leena Miettinen [Wed, 12 Oct 2011 12:51:08 +0000 (14:51 +0200)]
Doc: semantic highlighting for JavaScript
Change-Id: If5dfce9581fbbde3d5553f159bc0dd46ce30a5b2
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Joerg Bornemann [Wed, 12 Oct 2011 16:34:42 +0000 (18:34 +0200)]
changes-2.4.0 updated
Change-Id: Icbbb01f9b56f0e3d41da5ec2e0cd09c84162aff0
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Thomas Hartmann [Wed, 12 Oct 2011 14:24:43 +0000 (16:24 +0200)]
QmlDesigner: fix typo
Change-Id: If02d4ae2c5c3dddd877fef80af6eebcd10914b5a
Reviewed-by: hjk <qthjk@ovi.com>
Kai Koehne [Wed, 12 Oct 2011 13:48:59 +0000 (15:48 +0200)]
Task Pane: Sort list of filters alphabetically
Change-Id: Ife88fd800da42d45c859a5637bfa4259f898add2
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Kai Koehne [Wed, 12 Oct 2011 11:49:26 +0000 (13:49 +0200)]
FileInProjectFinder: Fix gcc warning
Change-Id: If58d9e84b34fbc2cbe755fb0d1492e305d4eadd1
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Leena Miettinen [Wed, 12 Oct 2011 12:29:55 +0000 (14:29 +0200)]
Doc: finding QML components with Find Usage
Change-Id: I66565602b9d63897f32bcb20bf68f9077d42fc54
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Kai Koehne [Wed, 12 Oct 2011 11:24:26 +0000 (13:24 +0200)]
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>
Kai Koehne [Wed, 12 Oct 2011 10:49:52 +0000 (12:49 +0200)]
Debugger: Remove commented out code
Change-Id: I17ecaed325cb362fad008a77533dafc442a0209e
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Kai Koehne [Wed, 12 Oct 2011 10:48:56 +0000 (12:48 +0200)]
Debugger: Initialize default layout for both QML and QML/CPP
Change-Id: Ib52c1664f0273d573bed28b8640d77e5292d40e3
Reviewed-by: hjk <qthjk@ovi.com>
Kai Koehne [Wed, 12 Oct 2011 10:47:24 +0000 (12:47 +0200)]
Debugger: "Reset to default layout" resets both QML and QML/CPP layout
Change-Id: Ia2d0de65d772826697ec51e6f82dc0e3fe36e05b
Reviewed-by: hjk <qthjk@ovi.com>
Jarek Kobus [Wed, 12 Oct 2011 12:30:36 +0000 (14:30 +0200)]
Fix typo
Change-Id: I257c749ea8376a424cf343c5695bd983ffb457a4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Christian Stenger [Fri, 7 Oct 2011 13:43:45 +0000 (15:43 +0200)]
Squish: Fixed some minor problems
* problems on shutdown (mostly Win)
* timing problems (Mac, Win)
* support for accidental whitespace in settingspath (all)
* added support for further special characters that could exist
inside TreeView of the Project files (all)
* removing the testing folder instead its content (all)
Change-Id: I146b56d253e3245641d0dcaebfad4d6f1dd684fc
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Leena Miettinen [Wed, 12 Oct 2011 09:20:42 +0000 (11:20 +0200)]
Doc: checking JavaScript syntax
Change-Id: Iad66cc619ed1027389569dea9bfd72bea6399af6
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Christian Kamm [Wed, 12 Oct 2011 11:11:20 +0000 (13:11 +0200)]
QmlJS: Clean up completion logic.
To avoid '/' triggering a global completion and improve code
readability.
Change-Id: I0cdb8efb159199156a766982db8979ee987f414b
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Leandro Melo [Wed, 12 Oct 2011 11:00:27 +0000 (13:00 +0200)]
Update changes file
Change-Id: I1ca9379934f0b4ac5605fc25a3dc25343a7485ce
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Jarek Kobus [Wed, 12 Oct 2011 10:28:38 +0000 (12:28 +0200)]
My changes
Change-Id: Idc3a62fef782d7cd594552847f389fe2ce08ed38
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Eike Ziller [Wed, 12 Oct 2011 09:51:36 +0000 (11:51 +0200)]
Add my changes.
Change-Id: I66c1a15b8e2cce8678024f3ff8929ab3c0a30790
Reviewed-on: http://codereview.qt-project.org/6517
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Yuchen Deng [Sat, 8 Oct 2011 14:58:13 +0000 (22:58 +0800)]
Git: Fixed launch gitk failed
Task-number: QTCREATORBUG-6262
Change-Id: I2095e4244b145e57e901fa9d6ca6adbcb10aa0c0
Merge-request: 402
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt-project.org/6510
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Jarek Kobus [Tue, 11 Oct 2011 08:33:32 +0000 (10:33 +0200)]
Add a label explaining the goal of editable preview
Change-Id: I6e3455f5767862150f95beac1ea4b7655619ca0c
Reviewed-on: http://codereview.qt-project.org/6363
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Kai Koehne [Tue, 11 Oct 2011 13:17:44 +0000 (15:17 +0200)]
FileInProjectFinder: Normalize project directory before checking for changes
Change-Id: Ia6ee0b0f8110add4a54bd470831d457dbb17c9c9
Reviewed-on: http://codereview.qt-project.org/6439
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Christian Kamm [Fri, 30 Sep 2011 13:04:45 +0000 (15:04 +0200)]
QmlJS highlighter: Highlight name after 'as' in imports.
Also fix a problem with the scope not being updated after initial
construction.
Change-Id: If5cf70bb029857b317ebbee3a6c4ee421213f24c
Reviewed-on: http://codereview.qt-project.org/6115
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Christian Kamm [Wed, 12 Oct 2011 06:53:43 +0000 (08:53 +0200)]
QmlJS: Fix the fix for scope chain rebuilds.
Change-Id: Idf18d44e647a2019405199bcc5273afb03816af1
Reviewed-on: http://codereview.qt-project.org/6498
Sanity-Review: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Christian Kamm [Thu, 6 Oct 2011 10:17:25 +0000 (12:17 +0200)]
QmlJS: Update builtins.qmltypes from Qt 5.
Adds QSGMouseEvent for completion inside MouseArea signal handlers.
Change-Id: I3e35a9d38dbf56848b3df5714efe82dd1ea88ea7
Reviewed-on: http://codereview.qt-project.org/6402
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Christian Kamm [Tue, 11 Oct 2011 10:47:46 +0000 (12:47 +0200)]
QmlJS: Allow for 'ModuleApi' elements in qmltypes files.
But ignore them for now. Reading them is a new feature that will
be introduced in master.
Change-Id: Id362caab2e3b48e198d87f59a0a7d99d24267378
Reviewed-on: http://codereview.qt-project.org/6431
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Christian Kamm [Wed, 12 Oct 2011 06:39:20 +0000 (08:39 +0200)]
QmlJS: Fix scope builder rebuilds.
Change-Id: If5e585b074dd1885c3b591b5d2b7c89d50078c58
Reviewed-on: http://codereview.qt-project.org/6497
Sanity-Review: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Christian Kandeler [Tue, 11 Oct 2011 14:20:39 +0000 (16:20 +0200)]
QtSupport: Fix compilation with gcc.
Change-Id: I271072584882e256c7bfcbc39acdef0b42495bda
Reviewed-on: http://codereview.qt-project.org/6445
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Christian Kandeler [Tue, 11 Oct 2011 13:57:49 +0000 (15:57 +0200)]
RemoteLinux: Allow additional entries in run config widget form layout.
Change-Id: I9d3aaee14a7a877bf0a8730a7299c7fad169c795
Reviewed-on: http://codereview.qt-project.org/6444
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Kai Koehne [Tue, 11 Oct 2011 13:41:56 +0000 (15:41 +0200)]
QmlProfiler: Align Attach dialog to the debugger one
Change-Id: Ic401c81848493ff77cb4f6fdeb5fb7a08042b930
Reviewed-on: http://codereview.qt-project.org/6441
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Kai Koehne [Tue, 11 Oct 2011 10:46:07 +0000 (12:46 +0200)]
Debugger: Re-layout "Attach to QML Port" dialog
Use colons after labels. Also, resize the input fields.
Change-Id: I1fee71ea00b61a772430f91d227076d63de2cae4
Reviewed-on: http://codereview.qt-project.org/6438
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Kai Koehne [Tue, 11 Oct 2011 10:36:01 +0000 (12:36 +0200)]
Gdb: Fix label in AttachCoreDialog
Change-Id: I32c7c2ce1e4c887638ca2b5c716c3b812b057913
Reviewed-on: http://codereview.qt-project.org/6437
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
Leena Miettinen [Tue, 11 Oct 2011 09:27:36 +0000 (11:27 +0200)]
Doc: new and updated refactoring actions
Change-Id: Iffa160a7482f8528f04a94082fcf8e9cda7f86ab
Reviewed-on: http://codereview.qt-project.org/6422
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Daniel Molkentin [Mon, 10 Oct 2011 16:18:31 +0000 (18:18 +0200)]
Add include guards for generated file app_version.h.
Change-Id: I3ad01e47d2a76159b1369330246b23ed03120597
Reviewed-on: http://codereview.qt-project.org/6361
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Thomas Hartmann [Mon, 10 Oct 2011 14:55:27 +0000 (16:55 +0200)]
WelcomePage: avoid deadlock on shutdown
invokeMethod Qt::BlockingQueuedConnection will deadlock if the event
loop has already stopped.
I use Qt::AutoConnection instead and manually sync using a timeout.
I also react to coreAboutToClose() to avoid unnecessary timeouts.
Change-Id: I941bfd6bb66eeb9040a9ae0900492003ca34e094
Reviewed-on: http://codereview.qt-project.org/6421
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Aurindam Jana [Mon, 10 Oct 2011 13:25:18 +0000 (15:25 +0200)]
V8DebuggerClient: Enable breakpoints on Exceptions
Previously break on exceptions was always enabled. Now, the user
can add a breakpoint on Javascript Exceptions from the breakpoint
window in the debugger.
Change-Id: Ia9ee813d2fccf89b607fe1dcbad47b4084155a48
Reviewed-on: http://codereview.qt-project.org/6348
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Friedemann Kleint [Mon, 10 Oct 2011 12:11:10 +0000 (14:11 +0200)]
Debugger/Python dumper: Fix checkRef() for Qt 5.
See http://codereview.qt-project.org/4533
(
1173d0420e341dc6d38c89e5bc4295a57da7ea74 in qtbase)
Change-Id: I13d249c592b2607ee96c2feacbaefb73dd926867
Reviewed-on: http://codereview.qt-project.org/6324
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
Leena Miettinen [Mon, 10 Oct 2011 15:12:42 +0000 (17:12 +0200)]
Doc: code style settings sets
Change-Id: Icbbed41de686071fa20ca4e19aca77d3bba049c7
Reviewed-on: http://codereview.qt-project.org/6358
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Kai Koehne [Fri, 7 Oct 2011 13:00:05 +0000 (15:00 +0200)]
QDeclarativeDebugClient: Expose internal error string
Forward error string from real device to QDeclarativeDebugClient.
Change-Id: I7ae63a6e8799b42fed387562b91ebfb594956f44
Reviewed-on: http://codereview.qt-project.org/6245
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Robert Loehning [Mon, 10 Oct 2011 17:44:18 +0000 (19:44 +0200)]
Compile fix
Change-Id: I1999e7ccc7e7fe45d656a6aa1ed7d51d827194d7
Reviewed-on: http://codereview.qt-project.org/6367
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
Friedemann Kleint [Mon, 10 Oct 2011 12:47:14 +0000 (14:47 +0200)]
Debugger: Compile manual debugger tests and dumber lib with Qt5.
Introduce conditionals in the profiles and source code to
be able to test Qt 4 and Qt 5.
Change-Id: I73df5558f2945742d3e56f94baca0ee4d5f9dab8
Reviewed-on: http://codereview.qt-project.org/6330
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kamm [Mon, 10 Oct 2011 11:22:47 +0000 (13:22 +0200)]
Welcome: Fix using desktop qml components in qml editor.
Change-Id: I2faefb06d1eba3b81be6f366479f3149fedcf885
Reviewed-on: http://codereview.qt-project.org/6319
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Kai Koehne [Mon, 10 Oct 2011 15:15:05 +0000 (17:15 +0200)]
WelcomeScreen: Use ListView instead of Repeater for news
This reduces number of objects created on startup, and also
allows us to simplify the logic a bit.
Change-Id: I6c7c2c5e537ff9a1882e133551f89c056cbe4fe5
Reviewed-on: http://codereview.qt-project.org/6359
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Kai Koehne [Mon, 10 Oct 2011 11:38:58 +0000 (13:38 +0200)]
Debugger: Always show "Start Debugging" methods
Don't rely on the 'current' project settings for actions like
Attach to QML port. Also, group the actions in a General,
Cpp and QML part, and add separators in between.
Change-Id: I3103a6fc777180a69eee128d39d19de17f312ff3
Reviewed-on: http://codereview.qt-project.org/6323
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
Daniel Teske [Mon, 10 Oct 2011 13:34:06 +0000 (15:34 +0200)]
Check all Makefile* for importing builds
Correctly import both MAKEFILE=Makefile.something in the .pro file, and
makefiles created via qmake MAKEFILE=Makefile.other.
Also correctly handles multiple Makefiles in one directory.
Task-number: QTCREATORBUG-6120
Change-Id: I9c04399aaea7c38f2a4ed2877195f2e36c8f20c7
Reviewed-on: http://codereview.qt-project.org/6347
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Robert Loehning [Mon, 10 Oct 2011 12:53:08 +0000 (14:53 +0200)]
Squish: Renamed "destination" to "target"
Change-Id: I8f8a1cc4b58642fc64adfa76eea84c2b4e9f0423
Reviewed-on: http://codereview.qt-project.org/6255
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Tobias Hunger [Thu, 6 Oct 2011 17:36:26 +0000 (19:36 +0200)]
VCS: Get current file from the editor
Get the current file from the editor, not the filemanager. The later
does not get updated for temporary files like those created by git
blame, leaving the file-based actions in the VCSes enabled when viewing
those temporary files, triggering actions on the last real file that
was visible.
Task-number: QTCREATORBUG-6250
Change-Id: I5c2d3c62805f69bc8e103f0776cd6796332f606c
Reviewed-on: http://codereview.qt-project.org/6175
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Eike Ziller [Mon, 10 Oct 2011 13:26:51 +0000 (15:26 +0200)]
Merge branch '2.4' of ssh://codereview.qt-project.org/qt-creator/qt-creator into 2.4
Eike Ziller [Mon, 10 Oct 2011 13:25:32 +0000 (15:25 +0200)]
Remove qttest plugin.
Change-Id: I593517c64b43d327a1fc6f9c9ca0c5c8f2aed588
Fawzi Mohamed [Thu, 6 Oct 2011 16:04:29 +0000 (18:04 +0200)]
gdb: workaround to lookup anonymous namespaces
work around for http://sourceware.org/bugzilla/show_bug.cgi?id=13269
Change-Id: Ibfaf409d48146bbed09c0e563c140a1b7a712d4f
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-on: http://codereview.qt-project.org/6179
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Christian Kamm [Mon, 10 Oct 2011 11:36:00 +0000 (13:36 +0200)]
QmlJS: Fix bug in context property extraction.
Skip forward declarations instead of giving up.
Change-Id: Id3a30296a7cefc4ef255d03727557dee6a37c362
Reviewed-on: http://codereview.qt-project.org/6321
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Daniel Teske [Mon, 10 Oct 2011 11:31:54 +0000 (13:31 +0200)]
Fix a crash with cmake and no toolchains configured
Task-number: QTCREATORBUG-6252
Change-Id: I8b7237c23cd70fe8dd20724ffb3ebdef18f5bf13
Reviewed-on: http://codereview.qt-project.org/6320
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Robert Loehning [Mon, 10 Oct 2011 11:10:34 +0000 (13:10 +0200)]
Squish: Don't add temporary files to git
Change-Id: Ia076166a867c1c1a9031ea6515143876f4a73d34
Reviewed-on: http://codereview.qt-project.org/6263
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Leena Miettinen [Fri, 7 Oct 2011 07:45:27 +0000 (09:45 +0200)]
Doc: NetSieben is no longer used
Change-Id: I9a8eccf5193198effe1b1957d79a10dee036eb11
Reviewed-on: http://codereview.qt-project.org/6224
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Robert Loehning [Fri, 7 Oct 2011 13:05:55 +0000 (15:05 +0200)]
Squish: Merged variations of createNewQtQuickApplication()
Change-Id: I5c2f88e18630922a34dbb52894ce6ef26697c28b
Reviewed-on: http://codereview.qt-project.org/6180
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Daniel Teske [Thu, 6 Oct 2011 11:13:01 +0000 (13:13 +0200)]
VCSBaseEditorParameterWidget::mapSetting cope with 0 pointer
Change-Id: I797488c6ace58a6f927fe3d528131682f1832de1
Reviewed-on: http://codereview.qt-project.org/6235
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Daniel Teske [Thu, 6 Oct 2011 11:12:22 +0000 (13:12 +0200)]
VcsBaseClientSetting, check the type before returning from the union
Change-Id: Ic40b88e1cf9b731509edc6636c1e0bdb5f053529
Reviewed-on: http://codereview.qt-project.org/6234
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Robert Loehning [Thu, 6 Oct 2011 18:16:15 +0000 (20:16 +0200)]
Squish: Moved contents of mainwin.py to other files
Change-Id: I998b1304dc9ad8832990da5e90ab426c38eb329e
Reviewed-on: http://codereview.qt-project.org/6182
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Eike Ziller [Fri, 7 Oct 2011 08:41:52 +0000 (10:41 +0200)]
Remove unused parameter.
Change-Id: I0aaedd0b7e880d9ace97bf357cd9924247558f0f
Reviewed-on: http://codereview.qt-project.org/6227
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Eike Ziller [Fri, 7 Oct 2011 06:42:00 +0000 (08:42 +0200)]
Merge remote-tracking branch 'origin/2.3' into 2.4
Christian Stenger [Thu, 6 Oct 2011 15:44:10 +0000 (17:44 +0200)]
Squish: Changed bad naming and property issue
Change-Id: I797820642f9f7041801930155dad2fc708e90ea0
Reviewed-on: http://codereview.qt-project.org/6177
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Robert Loehning [Thu, 6 Oct 2011 14:46:03 +0000 (16:46 +0200)]
Squish: Improved function checkCompile()
Change-Id: Ib1b0dada442dc58f1e56343cf4ae602650291fcf
Reviewed-on: http://codereview.qt-project.org/6167
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Tobias Hunger [Thu, 6 Oct 2011 17:35:11 +0000 (19:35 +0200)]
Git: Fix string
Make Blame look like the other file-based options.
Change-Id: I09b8ee9fff2ad3f564daa3922dccce3c5136e4a0
Reviewed-on: http://codereview.qt-project.org/6174
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Christian Stenger [Thu, 6 Oct 2011 14:45:13 +0000 (16:45 +0200)]
Squish: Fixed a bug with paths containing '.'
Change-Id: I97c9331dc1caa525b527a8d11992c39cdaa07296
Reviewed-on: http://codereview.qt-project.org/6168
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Friedemann Kleint [Thu, 6 Oct 2011 15:05:38 +0000 (17:05 +0200)]
tr()-fixes for 2.4.
Change-Id: Iaf94e8b634cd68bc8a5eaacc65df47fc40f2b3c7
Reviewed-on: http://codereview.qt-project.org/6173
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Tobias Hunger [Thu, 6 Oct 2011 16:21:39 +0000 (18:21 +0200)]
VCS: Handle empty arguments in EditorParameterWidgets
Task-number: QTCREATORBUG-6251
Change-Id: I833bcecf295b7191df1916a658b16f008f69f902
Reviewed-on: http://codereview.qt-project.org/6164
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Tobias Hunger [Thu, 6 Oct 2011 14:20:37 +0000 (16:20 +0200)]
Git: Use indexes to address pretty printing combobox
This fixes a incompatibility with the config settings.
Change-Id: I518291af2309acfaba7eea78b22519c283114009
Reviewed-on: http://codereview.qt-project.org/6161
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
OSDN Git Service
