OSDN Git Service

qt-creator-jp/qt-creator-jp.git
8 years agoMerge remote-tracking branch 'qtsw/master' master
axasia [Mon, 24 Oct 2011 15:38:00 +0000 (00:38 +0900)]
Merge remote-tracking branch 'qtsw/master'

8 years agoImprove messages of buildmanager to say build/deploy
Daniel Teske [Mon, 24 Oct 2011 15:56:46 +0000 (15:56 +0000)]
Improve messages of buildmanager to say build/deploy

As the buildmanager also deploys

Task-number: QTCREATORBUG-6374
Change-Id: I55e2a29b0b6e0942637c6da5eb8087d8903b6899
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
8 years agoDon't check depth of source vs build dir for Qt >=4.8
Daniel Teske [Mon, 24 Oct 2011 13:14:15 +0000 (13:14 +0000)]
Don't check depth of source vs build dir for Qt >=4.8

The bug in qmake leading to the warning is fixed.

Change-Id: I032bb5ad502a9eb3e8f43abc86e9aa8c9e7942c4
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
8 years agoLess magic in BuildStep::buildConfiguration() and deployConfiguration()
Daniel Teske [Fri, 21 Oct 2011 13:06:26 +0000 (13:06 +0000)]
Less magic in BuildStep::buildConfiguration() and deployConfiguration()

Where the deploy stuff depends on the activeBuildConfiguration it's
likely to be wrong or worse could be used to crash creator. So make
those places stand out.
Also if we ever move towards supporting meta-builds of multiple
buildconfigurations at once, then using the active build configuration
is wrong.

Change-Id: I754a77a4a8b352e79e8a6703c26ed41a189cf74e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
8 years agoQmlScriptConsole: Bug Fixes
Aurindam Jana [Sat, 22 Oct 2011 22:20:24 +0000 (00:20 +0200)]
QmlScriptConsole: Bug Fixes

If QDeclarativeDebugQuery returns "undefined" then evaluate expression
using JavaScript Engine only when on a debug break (InferiorStopOk state)

Change-Id: I0ad1b977e72b83111699ec90dbe9b5e9cbd8875c
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
8 years agoQmlEditor: show the id name when folding a block.
Nicolas Arnaud-Cormos [Wed, 14 Sep 2011 20:16:28 +0000 (22:16 +0200)]
QmlEditor: show the id name when folding a block.

If the id of an element exists, it will be displayed instead of the normal "..."

Change-Id: I4e6633743b0e2ae014b7fbad3c752ef318c73659
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
8 years agoCoding style fixes
Yuchen Deng [Sat, 22 Oct 2011 14:19:46 +0000 (22:19 +0800)]
Coding style fixes

Change-Id: I524be1971d812c865f10922dc402b7c98b7a16e8
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
8 years agoBuild fix when use -no-stl option
Yuchen Deng [Sat, 22 Oct 2011 11:02:31 +0000 (19:02 +0800)]
Build fix when use -no-stl option

error: C2027: use of undefined type ‘type_info’
predefined C++ types (compiler internal):126: see declaration of ‘type_info’
error: C2228: left of ‘.name’ must have class/struct/union

Change-Id: Iccf7348ad7f8d8b7bb5ca51204d0fb61a27a5215
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
8 years agoRemoteLinux: Guide user to project file from deploy widget.
Christian Kandeler [Fri, 21 Oct 2011 13:07:47 +0000 (15:07 +0200)]
RemoteLinux: Guide user to project file from deploy widget.

Change-Id: I52b3885ef0c671e856840fb48136fe5433bc5d8f
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
8 years agoSmall coding style cleanup
Tobias Hunger [Fri, 21 Oct 2011 09:41:20 +0000 (09:41 +0000)]
Small coding style cleanup

Change-Id: I4b7a3dbd58cb52f9c6245ed59be2b1be8c98f66d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
8 years agoFix build warning
Tobias Hunger [Fri, 21 Oct 2011 09:35:16 +0000 (09:35 +0000)]
Fix build warning

Change-Id: Ie192145319207e72b77f4645f9f506e77e4c1be3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
8 years agoGit: Add support for the i18n.logoutputencoding setting
Yuchen Deng [Fri, 21 Oct 2011 09:30:56 +0000 (09:30 +0000)]
Git: Add support for the i18n.logoutputencoding setting

Change-Id: I99df9765da1ba68c449f8879c8262c3ca3fbc28c
Merge-request: 382
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
8 years agoGit: Support encoding convert of commit messages
Yuchen Deng [Fri, 21 Oct 2011 09:30:56 +0000 (09:30 +0000)]
Git: Support encoding convert of commit messages

We need read i18n.commitEncoding value, to write correct encoding of the commit file.
In Windows OS, the default encoding is GBK, So we need convert to correct encoding of the commit messages.

Change-Id: Id5f35745dba15da2c9ceb1266e0ea537cba7da73
Merge-request: 382
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
8 years agoRemoteLinux: Don't force generic run configurations on all targets.
Christian Kandeler [Fri, 21 Oct 2011 09:21:19 +0000 (11:21 +0200)]
RemoteLinux: Don't force generic run configurations on all targets.

Instead, as a heuristic, check whether a RemoteLinuxDeployConfiguration
(not a derived one!) exists.

Change-Id: I06561e37ef8d0ddc6eddcf7ed211be779b21ab4d
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
8 years agoQmlJS: Fix build.
Christian Kamm [Fri, 21 Oct 2011 06:58:54 +0000 (08:58 +0200)]
QmlJS: Fix build.

Change-Id: I230442300bf03d229c0168c108eb69fbd98708af
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
8 years agoQmlJS checks: Warn about extra message suppressions.
Christian Kamm [Thu, 20 Oct 2011 07:45:29 +0000 (09:45 +0200)]
QmlJS checks: Warn about extra message suppressions.

Reviewed-by: Fawzi Mohamed
Change-Id: I4038cd863ba80c1719417cd03b755b047f7d8b5e
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
8 years agoQmlJS: Support module apis defined by QML modules.
Christian Kamm [Wed, 12 Oct 2011 06:36:02 +0000 (08:36 +0200)]
QmlJS: Support module apis defined by QML modules.

Change-Id: I18ec9daf8088f7db5ff2da11da14b539f501bab3
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
8 years agoQmlProfiler: fix offset difference between timeline and overview
Christiaan Janssen [Thu, 20 Oct 2011 14:33:49 +0000 (16:33 +0200)]
QmlProfiler: fix offset difference between timeline and overview

Change-Id: Ic91a203018e31eb14445deb39fa5a83ebc621ee7
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
8 years agoMake AbstractPackagingStep and derived classes thread safe
Daniel Teske [Thu, 13 Oct 2011 16:53:49 +0000 (18:53 +0200)]
Make AbstractPackagingStep and derived classes thread safe

Change-Id: I30d412dde2484b756dd2f06ed0a7b5030c14c9eb
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
8 years agoanalyzer: merge start and startRemote partially
hjk [Thu, 20 Oct 2011 14:07:50 +0000 (16:07 +0200)]
analyzer: merge start and startRemote partially

Change-Id: Iaa837f5bc696af7e71bbed128b9a5c8c46e512c7
Reviewed-by: hjk <qthjk@ovi.com>
8 years agodebugger: add testcase for valgrind
hjk [Thu, 20 Oct 2011 13:28:53 +0000 (15:28 +0200)]
debugger: add testcase for valgrind

Change-Id: I11caf760a2619fee88cfdc3568d533230b12a6c1
Reviewed-by: hjk <qthjk@ovi.com>
8 years agodebugger: add some test case for std::ifstream
hjk [Thu, 20 Oct 2011 13:20:50 +0000 (15:20 +0200)]
debugger: add some test case for std::ifstream

Change-Id: I296bdd70724d8ae4b70ea27de788b0bc0b2294cb
Reviewed-by: hjk <qthjk@ovi.com>
8 years agodebugger: renamed gdbdebugger.pro to debugger.pro in manual tests
hjk [Wed, 19 Oct 2011 14:37:26 +0000 (16:37 +0200)]
debugger: renamed gdbdebugger.pro to debugger.pro in manual tests

Change-Id: Idbf1494f501221943eb322aeac9e2c429930a52b
Reviewed-by: hjk <qthjk@ovi.com>
8 years agodebugger: add convienience constructor for std::strings
hjk [Mon, 17 Oct 2011 17:14:50 +0000 (19:14 +0200)]
debugger: add convienience constructor for std::strings

Change-Id: I61454ddbe417162ab182a1541b580e4cb4c783a4
Reviewed-by: hjk <qthjk@ovi.com>
8 years agoFix make not found in environment
Daniel Teske [Thu, 20 Oct 2011 14:39:59 +0000 (14:39 +0000)]
Fix make not found in environment

Change-Id: I5bfbe8cf36556cceec02011012d2d1c09d0c0ebc
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
8 years agoAdd a maximum Qt Version to the wizards
Daniel Teske [Mon, 17 Oct 2011 12:18:40 +0000 (14:18 +0200)]
Add a maximum Qt Version to the wizards

All existing wizards derived from AbstractMobileWizard do not support qt
5. So they won't offer them, nor default to them.

Task-number: QTCREATORBUG-6321
Change-Id: I999e2565cec5b0d7da04c10e38ac2cb101352e5b
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
8 years agoQmlJS: Improve tests/tools/qml-ast2dot.
Christian Kamm [Thu, 20 Oct 2011 09:03:03 +0000 (11:03 +0200)]
QmlJS: Improve tests/tools/qml-ast2dot.

Change-Id: Ifd06745ec823d09ae7b42318d418fa1adb01824b
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
8 years agoFix compilation of tests/tools/qml-ast2dot.
Christian Kamm [Thu, 20 Oct 2011 08:05:11 +0000 (10:05 +0200)]
Fix compilation of tests/tools/qml-ast2dot.

Change-Id: I192c8f218371bd45c5bc2ae2cbb1b4464b7f0956
Reviewed-by: Bill King <bill.king@nokia.com>
8 years agoDon't show Design mode if "designer" plugins are disabled/not present.
Eike Ziller [Wed, 19 Oct 2011 11:05:53 +0000 (13:05 +0200)]
Don't show Design mode if "designer" plugins are disabled/not present.

Change-Id: Iee0a01491075e1e82c17211b5e119bd5e167763b
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
8 years agoQmlJS checks: Suppression of static analysis messages.
Christian Kamm [Wed, 19 Oct 2011 12:27:40 +0000 (14:27 +0200)]
QmlJS checks: Suppression of static analysis messages.

* Use '// @disable M123' to suppress
* Add quick fix to add these comments

Change-Id: I499f5a6004148afbb346218c6fb01c9ca77b9f73
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
8 years agoQmlJS: Add quick fix to wrap element in Loader.
Christian Kamm [Wed, 19 Oct 2011 11:48:10 +0000 (13:48 +0200)]
QmlJS: Add quick fix to wrap element in Loader.

Change-Id: Ie8b1624abfd9faa8c6153ad99e48964d597d543c
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
8 years agoQmlJS checks: Add hint about not using var/variant property types.
Christian Kamm [Wed, 19 Oct 2011 12:09:15 +0000 (14:09 +0200)]
QmlJS checks: Add hint about not using var/variant property types.

Change-Id: I79c5c4db78eb96eda7c6f5d543bb5063d5670968
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
8 years agoGit: Add branches to locator
Yuchen Deng [Wed, 19 Oct 2011 10:24:15 +0000 (10:24 +0000)]
Git: Add branches to locator

Change-Id: I02803ed9f131ded8748c526e88ca9825944e7057
Merge-request: 408
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
8 years agoQmlJS indenter: Fix hang when using 'else (a==a) {}'.
Christian Kamm [Wed, 19 Oct 2011 07:21:48 +0000 (09:21 +0200)]
QmlJS indenter: Fix hang when using 'else (a==a) {}'.

Change-Id: Id7b8fba6707b1eaabf8065854f357cf600c809c5
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
8 years agoQmlJS indenter: Improve indentation of function literals.
Christian Kamm [Mon, 17 Oct 2011 11:58:00 +0000 (13:58 +0200)]
QmlJS indenter: Improve indentation of function literals.

Change-Id: Ic79745eefbf37e42d4dd42e73d3752bed34bbfa9
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
8 years agoQmlJS indenter: Move reusable code to qmljs lib.
Christian Kamm [Mon, 17 Oct 2011 11:56:48 +0000 (13:56 +0200)]
QmlJS indenter: Move reusable code to qmljs lib.

Change-Id: I5ab50b586109a9736cda48245807571ce10dfb5b
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
8 years agoCompile fix on Linux.
Friedemann Kleint [Tue, 18 Oct 2011 14:55:45 +0000 (16:55 +0200)]
Compile fix on Linux.

Change-Id: I046c3a843c9a77ccb1c0f6569220d1c7497d26f4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
8 years agoRevert "L10n: Update German translation for 2.4 beta."
Friedemann Kleint [Tue, 18 Oct 2011 14:08:25 +0000 (16:08 +0200)]
Revert "L10n: Update German translation for 2.4 beta."

This reverts commit bcfa5753620df669860e53f63eb0a3b38e021574

Change-Id: Ia9042e90333a51c62f52cfb7a8660dd747dae393
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
8 years agoL10n: Update German translation for 2.4 beta.
Friedemann Kleint [Tue, 18 Oct 2011 14:01:32 +0000 (16:01 +0200)]
L10n: Update German translation for 2.4 beta.

Change-Id: If871c83b4ba2346f7eb343a7391a2972018445d9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
8 years agozeroconf: fix windows building
Fawzi Mohamed [Tue, 18 Oct 2011 12:30:51 +0000 (14:30 +0200)]
zeroconf: fix windows building

Correct exports, fixed commented out ifdef, moved socket including to a separate header.

Change-Id: Iadb6f58e2c3dbadee411fc0df7c7519c1d90309d
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
8 years agozeroconf/mdnssd: build the fallback daemon on all linux flavors
Fawzi Mohamed [Tue, 18 Oct 2011 10:11:21 +0000 (12:11 +0200)]
zeroconf/mdnssd: build the fallback daemon on all linux flavors

Change-Id: Ie70fe778611bf4e6d48ed7e7e766dac4daf1eef2
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
8 years agoQmlJS: Introduce UnknownValue.
Christian Kamm [Mon, 10 Oct 2011 10:53:28 +0000 (12:53 +0200)]
QmlJS: Introduce UnknownValue.

To distinguish known-to-be-undefined from a genuinely unknown value.

Change-Id: I606b4ea4d726f94553400b8950d3c0a4e76564a8
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
8 years agofix <S-Ins> short cut in text editor
Joerg Bornemann [Tue, 18 Oct 2011 07:48:34 +0000 (09:48 +0200)]
fix <S-Ins> short cut in text editor

Only <Ins> should switch to overwrite mode.
<S-Ins> is supposed to paste text.

Change-Id: I66dd94d210488312a222a408cddb793451d14580
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
8 years agozeroconf: embedded mdnssd daemon
Fawzi Mohamed [Mon, 17 Oct 2011 16:39:24 +0000 (18:39 +0200)]
zeroconf: embedded mdnssd daemon

Allows zeroconf to work also on ubuntu/linux in a network where there
is a local domain (like nokia).
This code is taken with as little changes as possible (to ease merge)
from apple mDNSResponder 320.5 (thus it does not respect Qt code guidelines)

Change-Id: Ic68ec3970ee9d6b02d2dc7cfb0ae1fbaf5a95bef
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
8 years agozeroconf: native avahi, and working fallbacks
Fawzi Mohamed [Mon, 17 Oct 2011 16:30:52 +0000 (18:30 +0200)]
zeroconf: native avahi, and working fallbacks

* supports avahi through its native interface
* starts embedded deamon if found
* tested all fallbacks on ubuntu
* Service is a normal object now
* several smaller improvements
Change-Id: I36288ec6fcefb64a60b6284e4d86d4b589ba37b5
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
8 years agoQmlProfiler: Also store sysroot in settings
Kai Koehne [Mon, 17 Oct 2011 15:18:34 +0000 (17:18 +0200)]
QmlProfiler: Also store sysroot in settings

Change-Id: I323798b47d5f7fcdf8ad70ee3def89814a6522e9
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
8 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>
8 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>
8 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

8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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

8 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>
8 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>
8 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>
8 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

8 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>
8 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>
8 years agoVersion bump
Eike Ziller [Mon, 17 Oct 2011 09:02:12 +0000 (11:02 +0200)]
Version bump

Change-Id: I5a5079377d043c30c7aabefb2c11a4437ae6c92c

8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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)

8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>