GitLab

Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580

Change-Id: I9369dc8811bd2a4caab1de8910020e6cce563831
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
	src/plugins/cmakeprojectmanager/cmakeproject.cpp
	src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
	src/plugins/cmakeprojectmanager/makestep.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I153295bad2d97609d96d28945e9f942c5b46b2da

Change-Id: Ia5930fbbaf5af4b5d92f64101fa0a8e6f1d4d15f
Reviewed-by: Robert Loehning <robert.loehning@digia.com>

Depending on the import we have QtQuick.State.1.0 or
QtQuick.State.2.0.

We use majorQtQuickVersion to distinguish between 1.0/2.0.

QmlModelNodeFacade::qmlModelView() is made public for convenience.

Change-Id: Ice53f4985ed4fe1475e2155c16a70988d413e2e7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I8a973245297d8abae248bdb3fb632814497ff50b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

Task-number: QTCREATORBUG-7965
Change-Id: I4f1988a1f3bac7afe1d7195a74bdb874b1041344
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Christian A. Reiter <christian.a.reiter@gmail.com>

Task-number: QTCREATORBUG-7954

Change-Id: Ib188f80994ceea252bba02d1e6ac2b0f32a84157
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

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

Change-Id: I63d110cc76e166db44870853fa3b168167f9760b
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>

Change-Id: If052b4a018d5d0c20086a0251d7d1b206e7d4192
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>

It has been observed that on MacOs, a dynamic_cast from
Botan::Public_Key to Botan::RSA_PublicKey reproducibly fails even though
it should definitely succeed. This happens with both gcc and clang on
different Macs, but on no other platform. The problem could not be
reproduced with an example project.
The workaround is to move the allocation of the respective object from
the client side to the Botan library itself. In addition, the following
actions were taken to guard against similar problems in the future:
    - Also move to Botan the allocations of all other objects that are
potentially dynamically cast.
    - Use shared pointers for these objects, so the deallocation also
happens inside Botan.

Change-Id: Ie595a56a239a41e2629b6ff631de59910b8244dd
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

The form has vanished and wasn't up to date anymore anyhow.

Change-Id: I40292593e8e705da0b5e47f54ab6c1a519144404
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

The screenshots are now taken with a Mac and the text looked wrong.

Change-Id: I3b2358255eee752cdb6b0a21b7fb802916011771
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Task-number: QTCREATORBUG-7204

Change-Id: I6ce82c701246ddac9cadcdd22ef994b0086ce8f7
Reviewed-by: Andre Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I697a5e8d11b0aef926dd79a5e45a63ffdc567353
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

Change-Id: I2090fb58442ae9382220e85515188656f74e7e21
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>

On initial run we offer the user a choice between all the kits, which
are compatible with the cached generator. After the initial run, the
user can't change kits nor generators anymore.
Except if the builds into a new directory or adds a buildconfiguration,
then the user can choose between generators but not kits.

Task-number: QTCREATORBUG-7940
Task-number: QTCREATORBUG-7928

Change-Id: I9b663435cd2e021f7fe08379c1c487a6aebe8976
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>

Use perl instead of bash and avoid lots of rereading of the file,
making the script much faster to run.

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

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

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

The canonical form of the -spec argument is a relative path if the
mkspec is a child of the mkspec dir. Since we resolve all symlinks for
the mkspec, we must do the same for the mkspec dir.

Task-number: QTCREATORBUG-7908
Change-Id: I24628c2d49ff7ad078caa6fd3896cb407d0d7906
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

The console is now a part of qmljstools plugin. The console
appears as an output pane. A dummy QScriptEngine evaluates
expressions when a declarative debug session is not in
progress. During a debug session, the expressions are
evaluated by the debug services.

Task-Number: QTCREATORBUG-7402

Change-Id: Ic2eeac44fb335c706be03b89f8672b0356efe984
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>

Avoid using "." as includePath when it is unneeded

Change-Id: I9bc6f4ebe50409f49782520033fd5f098aed10d0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Upcoming BlackBerry devices require larger icon/splashscreen sizes than
the ones the plugin code was originally created for.

Use place holders in error strings to avoid further string changes
on future size changes

Change-Id: I1065fa68eeba4e03a60fee85da6dbb8922160af8
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

- Qt 4 is included on the device for the BB10, add its path to LD_LIBRARY_PATH and QT_PLUGIN_PATH
- Make application ID depend on project name

Change-Id: I2dc67c0415395cb0a2c64fec1f1c43a96a3dde2c
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

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

Only if the expression of the binding is changing.

Change-Id: Ief702082dff0ac473c8ade6f3fc0f0cf36e017f3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

In Qt5 QPointer should be used instead of QWeakPointer fo QObject tracking.

Change-Id: Ic9cdfaea77574bcf866716ded62bbf2d350d02f8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

Change-Id: Ib5e891a8563bfced2af93e4a516ef8f196e8ff1e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

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

Allow increasing/decreasing the first number after cursor position
(cursor doesn't have to be on the number).

Increase/decrease number by [count].

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

Change-Id: I58f63941038978b665455025313faafc851bccc8
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

m_controlShape is not in any scene.

Change-Id: I5047bf43cf33be409c7644ff03beee3e04ffbd60
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

This allows building qml2puppet as part of Qt Creator,
if Qt Creator is based on Qt 5.

For the moment it has to be build manually.

Change-Id: Ide3490fe09c1543d1e09506403f6de1c0bc3819c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

1000ms is too long. It was possible to close the designer
before the 1000ms finished.

100ms make it impossible to close the designer fast enough
to trigger the crash.

Change-Id: Ie12b406298350551551b36cb021b560eeeba7ecf
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

Add a close button to window asking what to do with documents that
were changed outside Creator. Finally a simple way to get rid of
open moc-files that trigger this window over and over again:-)

Task-number: QTCREATORBUG-7360
Change-Id: I7a373ed60d85d810caf6604bc7dae7bb7fa186a9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: Icae877d0c809ce6952b47d51e575930696738349
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Also use the optimization for snapshot views as well.

Change-Id: Ic8c2d9f874f09b6b3b4a50eb8c5d396f10ecd6cd
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>