GitLab

Plus some minor adjustments in the qbs project manager to an API change.

Change-Id: I41ea8571fee7ec666344464ecc4f808bf92f13ce
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Was accidentally disabled in 066efcd6.

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

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

To solve the problem with libQt5MultimediaQuick_p we need a way to detect
if an application is using both QtMultimedia and QtQuick.
This change adds logic to parse the -dependencies.xml file and look for
lib elements that have the extra attribute "extends". Libs with the
extends attribute will only be added to the list of dependencies, if the
library it extends is available.

Task-number: QTCREATORBUG-9300
Change-Id: I6f3e0a6d9158a91824e1e113f6aab7ec1112dd56
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Task-number: QTCREATORBUG-9298
Change-Id: I8660e7d9614e77d23e1ef6515904941505f410dd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

Fixes a bug in conjunction with ApplicationWindow.
Anchors did not update properly.

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

Task-number: QTCREATORBUG-9297

Change-Id: I06345bd53fe5672ce7606745e6b19f89379a18db
Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

The sdk should set that extra directory, via the sdktool.

E. g. something like
sdktool addKeys android MakeExtraSearchDirectory QString:%DIRECTORY%

where %DIRECTORY% is the bin directory of the bundled mingw.
That is Tools\MinGW\bin for the qt sdk.

Also see:
Task-number: QTCREATORBUG-9297

Change-Id: I487c67b7fb704dd00cf5c6f4f647c8c4fbe8cd3d
Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

Change-Id: Iddcf85d3a19bed28baa9bd4c5f964c370f8c9c42
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

We need to make sure there aren't left-over subdirectories in the
assets/ folder when you have used the bundling mechanism for
deployment.

To make this easier, we fix a bug where a missing slash
would cause multiple libraryPrefix() directories with different
suffixes under assets/ instead of just a single one containing
everything managed by creator. When the slash is added we can
simply remove the whole "assets/" + libraryPrefix() directory
recursively.

Task-number: QTCREATORBUG-9294
Change-Id: Ie24b55680d247df458bc70bbc15abdce51605627
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

To make sure libQt5QuickParticles.so is loaded for Qt Quick
applications, we need to be able to specify bundling
specific files, not just subdirectories.

Task-number: QTCREATORBUG-9299
Change-Id: I743ee5ea714355ba6398378f4f54b6ede64d4c85
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Source files can also be local files relative to the
.metainfo file.

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

We need the logic from 78aa64e0
in the bundle deployment as well. This will ignore
libgnustl_shared.so if the Qt installation contains it (for
compatibility mostly) and it will copy it from the NDK
into the bundle.

Task-number: QTCREATORBUG-9291
Change-Id: I5ab59602a3dc64d728a58dd1ee70153c09deac72
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Change-Id: Id2d9bd6b7f5ce56ff0d7ece30bb93a69969beecf
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Task-number: QTCREATORBUG-9264
Change-Id: I7c726177ff855da41d1971245655e8dc24740430
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Task-number: QTCREATORBUG-9253

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

Specify project source directory and sysroot.

Change-Id: Ie9287ef4da023159b131e67de51ffc218c4d2a70
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Change-Id: Ia8008748fb4d35507729c6ae684913e8bf72c985
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

Make sure the outline model only shows the first line
of a long property value.

Change-Id: Iac8059e927b10c400afec285a6dc6485cbbf49b4
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

Action like "Switch Header/Source" need to be performed in correct
context, in this case "CppEditor.C++Editor". But while command line is
focused the context is global.

Task-number: QTCREATORBUG-9217
Change-Id: I8680e7d9612e72d23e1ef6515904941505f410d8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

The QML source is now loaded while dragging, which creates
hickups.

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

When debugging on a QNX device on Windows, neither
DebugBreakProcess(..) nor "-exec-interrupt" works for interrupting
the inferior process. Neither does sending it a SIGINT signal using
"kill" on the device.

This changes the local gdb process to run under the CtrlC stub on
Windows when debugging on QNX. This enables us to send a Ctrl+C
message to gdb, which interrupts the inferior, and allows us to
insert breakpoints during runtime on Windows.

Change-Id: I4b01fbe81138f3fe7a939a7e64267bac4eb8bf43
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

If the Qt version built against is Qt 5, and the deployment
method is "Use libs on device" + "Use local Qt libs", Creator
will copy the required files into the app bundle and set
the necessary meta-data to make the Java code in the app
actually load them from the app bundle.

We also make this deployment method the default on Qt 5.

Change-Id: Ib7a33e7d1fbd22f76c85c31e1dbc68912a38eda8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Caused by a dangling pointer of a template instantiation which had been
cloned into the wrong control. The fix is to remove that control and
refer to the control of the bindings (which is the correct one).

Change-Id: I951a60f2e613aae1e4ac901ce99c820212018709
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

It is already gone from qmake.

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

On Windows it is "Ignore, Merge Tool, Skip, Abort", while on Linux it is
"Merge Tool, Ignore, Skip, Abort"

That makes Ignore default on Windows, which is confusing

Change-Id: Id7e9e8dd6fd5748d518de4d94db47ae075268627
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Instead mostly postpone it until the contents are needed.

Task-number: QTCREATORBUG-9149

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

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

Task-number: QTCREATORBUG-9230
Change-Id: I24a6277c9ca5f35c803e276da82ca2b9e9d79f57
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>

Otherwise we skip items derived from types only available via imports.

Change-Id: I102a4843652029dff777e12594efc4d5e5e50999
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

Actually "." properties can recurse infinitely.
If a type MyType has the property parenType of MyType and
it is a read only pointer, we get an infinitely recusion into
"." properties.

parentType.parentType.parentType...

Actually this seems to be valid QML and is really the case with Menu.
(In the private API though, indicated by "__")

Since we enumerate "." properties in the Qt Quick Designer, we
run into an infinite loop.

I just cut the recursion at level 3.
So we stop at myParent.myParent.myParent which I think is reasonable.

Change-Id: I80866ace00f940000407cc25cec9ad6fac8b6fee
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

The slowness is due to AndroidToolChain::addToEnvironment() being called
a lot on project opening. Thus we need to avoid any file opening or
process on loading.

This patch does 2 things:
a) It removes the call to sdkTargets() which is unneeded. That actually
checks which avds are available.

b) It caches the target sdk inside a named target setting. That means,
we assume that the file does not change behind our backs.

Task-number: QTCREATORBUG-9164

Change-Id: I9287934a0624db0b3e8318b8cf76e605418850c2
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

These items have proper default sizes.

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

Task-number: QTCREATORBUG-9220

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

Now both dynamic and snapshot views are supported under both
Unix/Linux and Windows.

The implementation is based on "cleartool pwv" which gets the
working view.

Change-Id: I0d21d2c84fae4a641a3bac8b1087cfeffb89c447
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

Change-Id: Ib999f8f00b065e4e51b70f1c5f81bdd17baabd8c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Preprocessor did not correctly handle when variadic macro arguments were not
provided at all, if there were other arguments: macro was not expanded
in case only the non variadic arguments were given.

 #define MACRO(...)       used to work fine for 0 or more arguments.
 #define MACRO(ARG0, ...) used to work only for 2 or more arguments, now fixed.

Change-Id: I64e9199ceccae05618a49931c2adad8e4f9471ba
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

This reverts commit 316f15cb3b6ce8aedaaee5a954da9d99b1090350

Wrong branch, should be master.

Change-Id: I700e8802300b8e1e093f73ea11e07c4cdb03b81a
Reviewed-by: hjk <hjk121@nokiamail.com>

Action like "Switch Header/Source" need to be performed in correct
context, in this case "CppEditor.C++Editor". But while command line is
focused the context is global.

Change-Id: Id9aa24641508a08f5196d314edc74644780c26d9
Reviewed-by: hjk <hjk121@nokiamail.com>

The model manager provides the import paths defined in .pro
and .qmlproject files.

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