OSDN Git Service

qt-creator-jp/qt-creator-jp.git
12 years agoEditors: Make base replace use RefactoringChanges
Leandro Melo [Mon, 17 Oct 2011 08:37:22 +0000 (10:37 +0200)]
Editors: Make base replace use RefactoringChanges

This fixes the encoding related issue below and also makes the code cleaner.

Task-number: QTCREATORBUG-6147
Change-Id: Ia61815217433da327206590b515e10d654bcc03f
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
12 years agoQmlJS checks: Limit warning about unintentional empty blocks.
Christian Kamm [Thu, 13 Oct 2011 12:19:50 +0000 (14:19 +0200)]
QmlJS checks: Limit warning about unintentional empty blocks.

    width: {
    }

should not trigger a warning. We now only warn if { and } are
on the same line.

Change-Id: I45fa846ff63d0a83de782c412212165845c07e72
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
12 years agoMerge remote-tracking branch 'origin/2.4'
Eike Ziller [Mon, 17 Oct 2011 14:44:41 +0000 (16:44 +0200)]
Merge remote-tracking branch 'origin/2.4'

Conflicts:
src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: Ie1ecdbaefb9cabebd90bc7c0f8837cc31dbac5af

12 years agoDebugger: Show/Hide Address Column in Stack Window
Aurindam Jana [Mon, 17 Oct 2011 13:06:56 +0000 (15:06 +0200)]
Debugger: Show/Hide Address Column in Stack Window

Show Address column in stack window only if explicitly enabled.
The address column is hidden by default.

Change-Id: I4e4b019dbcde1c2edb9fb3012831eee5054a8a22
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoFix make install for qml designer plugins.
Daniel Molkentin [Mon, 17 Oct 2011 13:34:22 +0000 (15:34 +0200)]
Fix make install for qml designer plugins.

Change-Id: I94bd2227da8567aa7c43daf9313ebbda1010c99f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoRevert "Compile with Visual Studio IDE: string macros don't need to be escaped"
Robert Loehning [Mon, 17 Oct 2011 13:23:00 +0000 (15:23 +0200)]
Revert "Compile with Visual Studio IDE: string macros don't need to be escaped"

This reverts commit fe80df7e2ffb9ca334723d13af749c7b3dc973a8.

With the above commit, Creator could not be compiled with MSVC 2008.

Change-Id: Idf4763fa1996edf3b94b7059b1889e0b4dd74d38
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoInstall qml customstyleplugin in the right place.
Daniel Molkentin [Mon, 17 Oct 2011 13:33:59 +0000 (15:33 +0200)]
Install qml customstyleplugin in the right place.

Change-Id: I1519a7df87eb8d6f499fcfd789eebb6aaa8cf58c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoFileInProjectFinder: Avoid double slash in sysroot'ed path
Kai Koehne [Sat, 15 Oct 2011 11:36:39 +0000 (13:36 +0200)]
FileInProjectFinder: Avoid double slash in sysroot'ed path

The file path from the device is already absolute, no need to add
another slash.

Change-Id: I591eb5ffee38bcea28564dcdc20541ee40f306a8
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
12 years agoQmlProfiler: Keep configuration of attach dialog
Kai Koehne [Sat, 15 Oct 2011 09:52:03 +0000 (11:52 +0200)]
QmlProfiler: Keep configuration of attach dialog

Change-Id: If9f4918a77c874c82fec63eacf1464b78b5d82ac
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
12 years agoQmlProfiler: Add "Sysroot" field to attach dialog
Kai Koehne [Sat, 15 Oct 2011 09:32:55 +0000 (11:32 +0200)]
QmlProfiler: Add "Sysroot" field to attach dialog

Change-Id: Id3c6a0eaa90096f2a7a0bdcfac10644e10e8858c
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
12 years agoMerge remote-tracking branch 'origin/2.4'
Eike Ziller [Mon, 17 Oct 2011 12:22:32 +0000 (14:22 +0200)]
Merge remote-tracking branch 'origin/2.4'

Conflicts:
qtcreator.pri
src/libs/qmljs/qmljstypedescriptionreader.cpp
tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp

Change-Id: Id032187023bb42f259a87545ceeb3c965dd01a32

12 years agoRemove obsolete file
Daniel Molkentin [Tue, 11 Oct 2011 14:44:20 +0000 (16:44 +0200)]
Remove obsolete file

Change-Id: Ic59098bbe57c90359d0bf7df8e3b8639a3aaf2d8
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoDebugger: Enable stack frames without an annotated function
Kai Koehne [Sat, 15 Oct 2011 11:38:41 +0000 (13:38 +0200)]
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>
12 years agoC++: Improve completion assist
Yuchen Deng [Tue, 11 Oct 2011 01:29:48 +0000 (09:29 +0800)]
C++: Improve completion assist

Avoid inserting characters that are already there.
e.g.
int testFly() {}
te|Fly()
When triggers a completion, the code will changed to:
testFly()|
But in before, the code will changed to:
testFly()|Fly()

Notice:  Character of '|' show the cursor position.

Change-Id: I6c111e30356b2549aebc6fbea05608e70d6ab41f
Merge-request: 398
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
12 years agoCompile with Visual Studio IDE: string macros don't need to be escaped
Peter Kuemmel [Mon, 17 Oct 2011 09:28:28 +0000 (11:28 +0200)]
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

12 years agoQmlJS indenter: Fix ternary multiline indent.
Christian Kamm [Fri, 14 Oct 2011 10:52:42 +0000 (12:52 +0200)]
QmlJS indenter: Fix ternary multiline indent.

Task-number: QTCREATORBUG-6208
Change-Id: I7e5267291bc01226b5339cb4abdbb15856c58477
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
12 years agoFixed stack-overflow when parsing insanely nested compound statements.
Erik Verbruggen [Mon, 17 Oct 2011 08:24:39 +0000 (10:24 +0200)]
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>
12 years agoVersion bump
Eike Ziller [Mon, 17 Oct 2011 09:02:12 +0000 (11:02 +0200)]
Version bump

Change-Id: I5a5079377d043c30c7aabefb2c11a4437ae6c92c

12 years agoDoc: must use Qt Quick Components when developing for MeeGo
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>
12 years agodebugger: more robust Qt 4 vs Qt 5 detection in dumper
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>
12 years agoQmlDesigner.designDocumentController: fixes update of SubComponentManger
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>
12 years agogitignore: Ignore *.autosave
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>
12 years agoDoc: fix bug
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>
12 years agoremove nonexistent include path from glsl.pri
Joerg Bornemann [Fri, 14 Oct 2011 10:34:05 +0000 (12:34 +0200)]
remove nonexistent include path from glsl.pri

Change-Id: I66afdc3a380f9e5b901906349863e33ae353b2ae
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoRemove processEvents
Daniel Teske [Thu, 13 Oct 2011 17:50:47 +0000 (19:50 +0200)]
Remove processEvents

Change-Id: I8daa2a9675d72886aa598d4f17ee48e55665f92a
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
12 years agodebugger: Added function to test NULL pointer dereference
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>
12 years agoMake MaemoInstallPackagToSysroot* thread-safe
Daniel Teske [Thu, 13 Oct 2011 16:51:15 +0000 (18:51 +0200)]
Make MaemoInstallPackagToSysroot* thread-safe

Change-Id: If4ded3f5596c16409012edf267d96a72c3b7f4ad
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
12 years agoFix detection of Oxygen style
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>
12 years agoDoc: shortcut to check JavaScript code syntax
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>
12 years agoFix documentation for custom project wizard.
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>
12 years agoDoc: Issues pane filters
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>
12 years agoRemove unused functions
Daniel Teske [Fri, 23 Sep 2011 15:14:40 +0000 (17:14 +0200)]
Remove unused functions

Change-Id: Ia963100fe3ab6ebae0eeaa7f28479fd2dc819a37
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
12 years agoQmlJS: Fix build with Qt 4.7.
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>
12 years agoQmlDesigner.property: fix specialization of property pane
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>
12 years agoRemoteLinux: Include sysroot in incremental deployment logic.
Christian Kandeler [Fri, 14 Oct 2011 10:13:58 +0000 (12:13 +0200)]
RemoteLinux: Include sysroot in incremental deployment logic.

Change-Id: Ib4a2ea3edb30b852d1eb145d129185b256dcaf06
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
12 years agoFix typo
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>
12 years agooverwrite mode support for the text editor
Joerg Bornemann [Thu, 6 Oct 2011 14:48:47 +0000 (16:48 +0200)]
overwrite mode support for the text editor

Change-Id: Ibe0b8123429721511ebfde15a604229982fdc5d1
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
12 years agoQmlDesigner.itemLibrary: fix for desktop widgets
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)

12 years agoUpdate Polish translations
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>
12 years agoAdd missing command line help.
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>
12 years agodebugger: don't show warning about release builds on Mac
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>
12 years agoHarmattan: Support "no Aegis manifest file" case.
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>
12 years agoDebugger: Automatically adapt to the languages the running engine supports
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>
12 years agoFix typo
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>
12 years agoDebugger: Avoid "Could not connect ... QML debugger" warning for mixed debugging
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>
12 years agoDebugger: Avoid 'start debugging' action being enabled why debugging
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>
12 years agoDebugger: Disable stepping from QML->CPP for the time being
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>
12 years agoDebugger: Expose which languages (QML, C++, Any) an engine supports
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>
12 years agoActually delete CONFIG+=declarative from list of user arguments
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>
12 years agoSquish: Moved remaining functions for creating projects to project.py
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>
12 years agoDoc: QML and C++
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>
12 years agoAdapt default window size to larger window borders.
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>
12 years agoQmlDesigner.contextMenu: fix for layout
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>
12 years agoQmlDesigner: crash fix
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>
12 years agoDebugger: Ignore instruction-wise operator mode for stepping QML
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>
12 years agoQmlDesigner: changes-2.4.0
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>
12 years agonon-existent paths from INCLUDEPATH removed in help.pri
Joerg Bornemann [Thu, 13 Oct 2011 04:26:55 +0000 (06:26 +0200)]
non-existent paths from INCLUDEPATH removed in help.pri

Change-Id: I4d2c26596b97e269fa599a0614be4eeeb21ad491
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoQmlCppEngine: Make sure that breakpoint markers get removed
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>
12 years agodebugger: fix typo
hjk [Thu, 13 Oct 2011 09:41:18 +0000 (11:41 +0200)]
debugger: fix typo

Change-Id: I80b706800452ec53c12985f71ea2ffbc9ab667bf
Reviewed-by: hjk <qthjk@ovi.com>
12 years agodebugger: more robust Qt 4 vs Qt 5 detection in dumper
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>
12 years agohelp: Add '...' to indicate there will be another dialog
hjk [Wed, 12 Oct 2011 15:56:31 +0000 (17:56 +0200)]
help: Add '...' to indicate there will be another dialog

Change-Id: Ic884acf20f1d1a48f5306b380338fd0a99d63fa8
Reviewed-by: hjk <qthjk@ovi.com>
12 years agodebugger: actually use the htiCount field
hjk [Wed, 12 Oct 2011 14:55:13 +0000 (16:55 +0200)]
debugger: actually use the htiCount field

Change-Id: I1169f6859810da38d93a8d3e9e9d97e354bedf0b
Reviewed-by: hjk <qthjk@ovi.com>
12 years agodebugger: make threadsviews sortable
hjk [Thu, 13 Oct 2011 08:17:06 +0000 (10:17 +0200)]
debugger: make threadsviews sortable

Change-Id: I9abdcc76d406f806de0d617aa731f97adde97060
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoQmlJS: Fix QUrl completion with Qt 4.8.
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>
12 years agoUpdate 2.4 changelog for C++ and QmlJS changes.
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>
12 years agoRemoteLinux: More helpful message for SFTP upload failures.
Christian Kandeler [Thu, 13 Oct 2011 07:52:51 +0000 (09:52 +0200)]
RemoteLinux: More helpful message for SFTP upload failures.

Also introduce convenience funtion to DeployableFile.

Change-Id: I271f47a4ecb0b410e1ef36727c735d0cd2f4ff69
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
12 years agoDoc: semantic highlighting for JavaScript
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>
12 years agoDebugger: Fix build break on Windows
Aurindam Jana [Wed, 12 Oct 2011 17:29:34 +0000 (19:29 +0200)]
Debugger: Fix build break on Windows

Removed inclusion of parser.pri from qml.pri and added QML_PARSER_EXPORT
to QmlJSGrammar.

Task-number: QTCREATORBUG-6292
Change-Id: I6a1fb3e038a6c154c4c3b368d7c7e6eda9975698
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoQmlJS: Convert more dynamic_casts to value_casts.
Christian Kamm [Wed, 12 Oct 2011 09:37:58 +0000 (11:37 +0200)]
QmlJS: Convert more dynamic_casts to value_casts.

And introduce a good error message for the case when someone
forgets the specialization of the value_cast template.

Change-Id: Iec55a839e8f5eef5872b1dab8601f66e0e0c88de
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
12 years agochanges-2.4.0 updated
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>
12 years agodebugger: re-enable interrupting in remote setups
hjk [Wed, 12 Oct 2011 14:34:02 +0000 (16:34 +0200)]
debugger: re-enable interrupting in remote setups

Change-Id: I6d4503ec78e3ce590691dde69992a1599b506fc5
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
12 years agoQmlDesigner: fix typo
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>
12 years agoZeroConf: Interface improvements.
Christian Kandeler [Wed, 12 Oct 2011 09:46:52 +0000 (11:46 +0200)]
ZeroConf: Interface improvements.

Change-Id: I1966d375167612675ac78a40de4060ff1810c9d4
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
12 years agoTask Pane: Sort list of filters alphabetically
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>
12 years agoQmlJSScriptConsole: Refactored ScriptConsole, added functionality.
Aurindam Jana [Thu, 6 Oct 2011 15:38:28 +0000 (17:38 +0200)]
QmlJSScriptConsole: Refactored ScriptConsole, added functionality.

The ScriptConsole is renamed to QmlJSScriptConsole. The console can be used
to evaluate expressions during a QML application debug session.
Changes:
* Console can be used even when application is not on a debug break
* The object context is the currently selected object in Inspector
* ContextMenu has a Clear option
* Multiple line expressions are supported
* Traverse Command History using up and down arrow keys

Change-Id: I4e1cd8763d60be43dbba395ead2a9a086d6bab7d
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoFileInProjectFinder: Fix gcc warning
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>
12 years agoDoc: finding QML components with Find Usage
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>
12 years agoC++: Fix hexadecimals in quick fix
Leandro Melo [Wed, 12 Oct 2011 11:47:35 +0000 (13:47 +0200)]
C++: Fix hexadecimals in quick fix

Task-number: QTCREATORBUG-6240
Change-Id: Id3dc48d47f88017b3bc9e026c8e5552d2e9f4d48
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
12 years agoDebuggerMainWindow: Fix issues with default layout
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>
12 years agoDebugger: Remove commented out code
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>
12 years agoDebugger: Initialize default layout for both QML and QML/CPP
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>
12 years agoDebugger: "Reset to default layout" resets both QML and QML/CPP layout
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>
12 years agoFix typo
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>
12 years agoSquish: Fixed some minor problems
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>
12 years agoDoc: checking JavaScript syntax
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>
12 years agoQmlJS: Clean up completion logic.
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>
12 years agoUpdate changes file
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>
12 years agoMy changes
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>
12 years agoAdd my changes.
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>

12 years agoGit: Fixed launch gitk failed
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>

12 years agoQmlJS: Another compile fix for wrong rebase.
Christian Kamm [Wed, 12 Oct 2011 09:39:02 +0000 (11:39 +0200)]
QmlJS: Another compile fix for wrong rebase.

Change-Id: Ic46a72e3f9ad6689d260264c9f74dc4e17d01ee5
Reviewed-on: http://codereview.qt-project.org/6511
Sanity-Review: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
12 years agoJson: Fix indenter for json files.
Christian Kamm [Wed, 5 Oct 2011 10:40:27 +0000 (12:40 +0200)]
Json: Fix indenter for json files.

Change-Id: Id864509dd78a70fc34a3798b80f7e1c8991181f4
Reviewed-on: http://codereview.qt-project.org/6038
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
12 years agoJson: Use the javascript editor for json files.
Christian Kamm [Wed, 5 Oct 2011 10:09:14 +0000 (12:09 +0200)]
Json: Use the javascript editor for json files.

Task-number: QTCREATORBUG-4639
Change-Id: Icd0fda434d5ca66056d784dd87240db76e8a442c
Reviewed-on: http://codereview.qt-project.org/6035
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
12 years agoAdd a label explaining the goal of editable preview
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>
12 years agoFileInProjectFinder: Normalize project directory before checking for changes
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>
12 years agoQmlProfiler: Allow user to specify a sysroot for "Attach to Port"
Kai Koehne [Tue, 11 Oct 2011 13:21:00 +0000 (15:21 +0200)]
QmlProfiler: Allow user to specify a sysroot for "Attach to Port"

Change-Id: I943255e5a501610195e3758f9fbb42d127f15524
Reviewed-on: http://codereview.qt-project.org/6451
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
12 years agoQmlJS: Add more value_casts.
Christian Kamm [Mon, 10 Oct 2011 08:55:37 +0000 (10:55 +0200)]
QmlJS: Add more value_casts.

And switch all existing dynamic_casts to value_casts.

Change-Id: I93b89358e4802080f40b332074c64f4e91a2bc4c
Reviewed-on: http://codereview.qt-project.org/6311
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
12 years agoQmlJS: Compile fix.
Christian Kamm [Wed, 12 Oct 2011 08:55:01 +0000 (10:55 +0200)]
QmlJS: Compile fix.

Change-Id: Ie7d49f1dd54cd8316d660bc8ae6857dc2effc963
Reviewed-on: http://codereview.qt-project.org/6504
Sanity-Review: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
12 years agoQmlJS: Rename QmlObjectValue -> CppComponentValue.
Christian Kamm [Mon, 10 Oct 2011 08:32:33 +0000 (10:32 +0200)]
QmlJS: Rename QmlObjectValue -> CppComponentValue.

Reviewed-by: Fawzi Mohamed
Reviewed-by: Thomas Hartmann
Change-Id: Ib89388d5a5678403e4637eec5829f3520637ee27
Reviewed-on: http://codereview.qt-project.org/6310
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Sanity-Review: Christian Kamm <christian.d.kamm@nokia.com>

12 years agoQmlJS: Always allow changing name in 'make component' quickfix.
Christian Kamm [Tue, 4 Oct 2011 09:21:32 +0000 (11:21 +0200)]
QmlJS: Always allow changing name in 'make component' quickfix.

Reviewed-by: Fawzi Mohamed
Change-Id: I95a3ea500482731e1a4633683339ff5acd052218
Reviewed-on: http://codereview.qt-project.org/5975
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Sanity-Review: Christian Kamm <christian.d.kamm@nokia.com>