When looking for lines in Java files that are not supported by the
selected API level, it didn't take into account that line endings are
"\r\n" on Windows. toInt() was failing, trying to convert for example
"10\r" to an integer.
Change-Id: I35478abd40d5ce4621d2320b3a5f5a3514cf9591
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This will keep the setting from vanishing after the first time
creator is run.
Change-Id: Ie3f99cfbe37fc5c242e5388a87edf3f0bdc08a30
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
getBundleInformation must be called synchronously
Change-Id: Iebe00295e1ef0679fdd6f9b849672d72f5ea998a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Was temporarily disabled for 2.7 and not supposed to be merged into 2.8
This reverts commit d3e69915da.
Conflicts:
src/plugins/android/androiddebugsupport.cpp
Change-Id: I669d587535545846b5fcbdadd0d066f1758a3644
Quick fix. Do not merge into 2.8 or master
Task-number: QTCREATORBUG-9342
Change-Id: Ic63d5d858321e381caf9ede7615075e4923a7b35
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
One QProcess per run of clean libs
Change-Id: Idcf6155e71ca5cec7cb4be1509191ba49c69cefd
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@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>
Fx the version code spinbox being too big and readd some tooltips.k
Change-Id: I6e2e10d64d9616809f3b97c8c9a5d1e668c025ea
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Use the same styling as e.g. the submit editor.
Change-Id: Idb396b6971f75d9f4a876edf992c917ee81820df
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>
* Unused variables in release build
* Comparison of bool to int
Change-Id: I1ac9b1051b26ae0655d4ff6b92d216926a4785da
Reviewed-by: hjk <hjk121@nokiamail.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>
The order does not matter but this makes it easier for the user to find
his permission.
Change-Id: Iecb1082c3a67e002df6b0d384a3e02d45673d717
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
We need the logic from 78aa64e06b
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>
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>
Disallow keywords, and parts that start with a digit.
Task-number: QTCREATORBUG-9200
Change-Id: Ia8b42c3015393f3e76126e311eebb728425726b7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@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>
