qt-creator-jp

Fork

Merge remote-tracking branch 'qtsw/master'

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>

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>

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>

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>

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>

Coding style fixes

Change-Id: I524be1971d812c865f10922dc402b7c98b7a16e8
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

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>

RemoteLinux: Guide user to project file from deploy widget.

Change-Id: I52b3885ef0c671e856840fb48136fe5433bc5d8f
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

Small coding style cleanup

Change-Id: I4b7a3dbd58cb52f9c6245ed59be2b1be8c98f66d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Fix build warning

Change-Id: Ie192145319207e72b77f4645f9f506e77e4c1be3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Git: Add support for the i18n.logoutputencoding setting

Change-Id: I99df9765da1ba68c449f8879c8262c3ca3fbc28c
Merge-request: 382
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

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>

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>

QmlJS: Fix build.

Change-Id: I230442300bf03d229c0168c108eb69fbd98708af
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>

QmlJS checks: Warn about extra message suppressions.

Reviewed-by: Fawzi Mohamed
Change-Id: I4038cd863ba80c1719417cd03b755b047f7d8b5e
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>

QmlJS: Support module apis defined by QML modules.

Change-Id: I18ec9daf8088f7db5ff2da11da14b539f501bab3
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>

QmlProfiler: fix offset difference between timeline and overview

Change-Id: Ic91a203018e31eb14445deb39fa5a83ebc621ee7
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>

Make AbstractPackagingStep and derived classes thread safe

Change-Id: I30d412dde2484b756dd2f06ed0a7b5030c14c9eb
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

analyzer: merge start and startRemote partially

Change-Id: Iaa837f5bc696af7e71bbed128b9a5c8c46e512c7
Reviewed-by: hjk <qthjk@ovi.com>

debugger: add testcase for valgrind

Change-Id: I11caf760a2619fee88cfdc3568d533230b12a6c1
Reviewed-by: hjk <qthjk@ovi.com>

debugger: add some test case for std::ifstream

Change-Id: I296bdd70724d8ae4b70ea27de788b0bc0b2294cb
Reviewed-by: hjk <qthjk@ovi.com>

debugger: renamed gdbdebugger.pro to debugger.pro in manual tests

Change-Id: Idbf1494f501221943eb322aeac9e2c429930a52b
Reviewed-by: hjk <qthjk@ovi.com>

debugger: add convienience constructor for std::strings

Change-Id: I61454ddbe417162ab182a1541b580e4cb4c783a4
Reviewed-by: hjk <qthjk@ovi.com>

Fix make not found in environment

Change-Id: I5bfbe8cf36556cceec02011012d2d1c09d0c0ebc
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

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>

QmlJS: Improve tests/tools/qml-ast2dot.

Change-Id: Ifd06745ec823d09ae7b42318d418fa1adb01824b
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>

Fix compilation of tests/tools/qml-ast2dot.

Change-Id: I192c8f218371bd45c5bc2ae2cbb1b4464b7f0956
Reviewed-by: Bill King <bill.king@nokia.com>

Don't show Design mode if "designer" plugins are disabled/not present.

Change-Id: Iee0a01491075e1e82c17211b5e119bd5e167763b
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>

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>