Commit Graph

1898 Commits

Author SHA1 Message Date
Orgad Shaneh
585ef766cc Android: Use correct form of error message
Change-Id: Ie2756514d68fb02e15fbe97216bbf3c56ddfe77a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-20 08:15:37 +00:00
Orgad Shaneh
5f3442d25e Android: Fix compilation
Change-Id: I72be1ccb8afc235441c9c1ba65d3cef4fc6e6779
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-01-20 06:39:53 +00:00
Christian Kandeler
c05a3fdb3d Give the values of BuildStep::OutputFormat better names
The old ones did not convey their meaning very well. In particular,
NormalOutput and MessageOutput were easily confused.

Change-Id: Ia0a8c1b1c366ab3f5c59f751b37b8b1f68f6831d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-19 16:08:57 +00:00
Thomas Hartmann
f446fdc077 Fixing capitalisation of titles
Change-Id: I6a915cc69fe1cf6630d1a9a0fdb6b7a8d39b306c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-01-18 13:41:38 +00:00
Tobias Hunger
96c6033d39 QtVersionManager: Rename QtVersionManager::unsortedVersions(...)
Rename QtVersionManager::unsortedVersions(...) to QtVersionManager::versions(...).

This is what you should use, so make that the obvious choice.

Change-Id: Ice6e195d9aad7968ce87d378323627347b22bc74
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-18 10:40:12 +00:00
Tobias Hunger
a89100fe47 ToolChainManager: Allow for filtering of toolchains
Allow to provide a Predicate to ToolChainManager::toolChains and
add a ToolChainManager::toolChain method.

Change-Id: I0849f6fa67ffd8d5c6cfe4253cb0a326e1b023fa
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-17 13:13:53 +00:00
Tobias Hunger
6553c3c99e BaseQtVersion: Allow for a predicate when retrieving Qt versions
Make methods used to retrieve Qt versions from the Qt versions manager
take a predicate to select the interesting version.

Change-Id: I9218c57bae6d5033d49d618dfc0da41fe578444d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-17 13:13:48 +00:00
Vikas Pachdha
3fa45170b5 Android: Do sanity check for keystore path and certificate alias
Task-number: QTCREATORBUG-17304
Change-Id: Ifc0e354789d49efa3cb1d3e3e67eb40b331b40c7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-01-16 15:06:28 +00:00
Vikas Pachdha
509657b6a1 Android: Fix file system name for Android kits not being sticky
Task-number: QTCREATORBUG-17567
Change-Id: I48a3b2f8486c63676bb18ff025ed6412f48e3873
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-13 14:58:06 +00:00
Tobias Hunger
ebf6acadbc Android: WS-only change
Change-Id: Id34bc1bb8a4d75fe53d10c7bc1ba22b6bd5c2011
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-13 12:36:51 +00:00
Eike Ziller
b1f1ccb32e Merge remote-tracking branch 'origin/4.2'
Conflicts:
	src/plugins/android/androidbuildapkstep.cpp
	src/plugins/genericprojectmanager/genericproject.cpp

Change-Id: I3484b668f9323ed0c05de99f8dfed07c9e65ab98
2017-01-11 09:29:37 +01:00
Vikas Pachdha
acb07875b7 Android: Fix workflow issues in package signing password dialogs
Task-number: QTCREATORBUG-17545
Change-Id: Ide0c322a50455997c7b8fb2350dbdef1d76257c9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-10 11:30:47 +00:00
BogDan Vatra
c4afe5d79b Android: Fix keytool result handling
keytool return code != 0 if the password is incorrect.

Task-number: QTCREATORBUG-17317
Change-Id: I248b4a687ef48a849d42a70940009738d29a609c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-05 09:07:20 +00:00
Ulf Hermann
018ba5a834 Rename the "ERROR" icon to "CRITICAL"
We mostly use this icon in terms of showing messages which might be
informational, warnings, or errors. We cannot call the icon "ERROR" as
that clashes with some macro on windows. To be more inline with Qt's
predefined messaging macros (qDebug(), qInfo(), qWarning(),
qCritical(), qFatal()), we rename the icon to "CRITICAL" and regroup
the entries in the header to suggest this usage.

Change-Id: I89880919d7ca54ea9c86de384eb29f375bf3075f
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-01-02 12:27:54 +00:00
Tobias Hunger
82c1488bcc ToolChains: Make language part of the default toolchain name
Change-Id: I9f8a4ad79316d0cb6e0de40fa4a8b9dd4fa6e33d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-21 14:21:39 +00:00
Robert Loehning
b0fa868758 Android: Use numerous form
Change-Id: I4b9bb8ef1053f1dc86547f618b35746e1f9b06a6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-12 17:24:37 +00:00
Eike Ziller
c175f1e62f Merge remote-tracking branch 'origin/4.2'
Conflicts:
	src/plugins/ios/iosdevice.cpp
	src/plugins/ios/iossimulator.cpp
	src/plugins/projectexplorer/projectwindow.cpp
	src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp
	src/shared/qbs

Change-Id: Ie98e2401a2259903141a13170c78388f2da467d2
2016-12-09 12:42:01 +01:00
BogDan Vatra
87b39ddd5a Android: Merge stdout & stderr channles
On Android 7.1.1 the error is fired on "stderr" on previous versions on
"stdout"

Change-Id: I72c06694a22084d455e26eea95ddfdb8a93a39b2
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-12-07 15:37:03 +00:00
Tobias Hunger
732b832973 AbstractProcessStep: Clean up code
Change-Id: Iae3d1e7cbd02d34da5cebbf0291948dbdd2e95df
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-07 13:17:59 +00:00
BogDan Vatra
52b14f24f1 Add API 25 to known APIs
Change-Id: Ia06bd8638c8939918383b8274f06fc73d9c86122
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-07 09:54:20 +00:00
Tobias Hunger
ab20b08d6d Android: Initialize all members
Change-Id: Id10174da9c8b6e2cf34ac3465f0bf57361990e7e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-07 08:39:36 +00:00
Tobias Hunger
de0cf4e92c Android: Simplify code and make sure all members are initialized
Change-Id: I873737d39865f9a920a5893c9630430e6803a6ee
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2016-12-06 10:18:54 +00:00
Eike Ziller
e487b3bd55 Merge remote-tracking branch 'origin/4.2'
Change-Id: I575f1cf98f2a4740577cdd94da21687d3392cdb7
2016-11-30 15:09:11 +01:00
Alessandro Portale
a00ee753fe ProjectExplorer: Introduce IDeviceFactory::iconForId()
This adds the possibility to have an icon for a device type. Now,
a Kit can have a proper icon if just the device type but not device
is selected.

Change-Id: I2a382ffd5b46cbbf74cdd0b934b3d450d300bfff
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-11-30 13:55:38 +00:00
Vikas Pachdha
24ae8e0491 Android: Change polling pid script to fix permission denied issues
Task-number: QTCREATORBUG-17272
Change-Id: Ia45ad8b2bd9e1d1c984c600d320241b81580d85f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-11-29 17:00:58 +00:00
Tobias Hunger
38f089c580 Android: Initialize CreateAvdInfo::sdcardSize
Change-Id: I77c4055c488fd426e186666ac6ee48e3b60211c6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-29 15:12:49 +00:00
Vikas Pachdha
bf8f998b5e Android: Fix android app startup
Method to find the pid is changed. Not all android versions support grep
and test commands

Task-number: QTCREATORBUG-17272
Change-Id: Ifa67444af55eaf06fb2d6f6bb0439cfaf3bf305e
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-11-28 11:19:23 +00:00
BogDan Vatra
de687f5f9e Fix AndroidRunner
"m_tries" and "m_wasStarted" must be initialized before "m_psProc-
>start" call, because m_psProc will emit "QIODevice::readyRead" signal
before the function ends.

Change-Id: I10c63ca2d15c362d6df04018757b1916b9989893
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-11-08 10:03:00 +00:00
Tobias Hunger
4f374d4bbf Android: Clean up Kit updates
Change-Id: Iab45062012fb91a8f62ee227af8b6a7ab94a8fed
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2016-10-27 10:36:44 +00:00
Tobias Hunger
5a2001f730 Android: Add C toolchains
This should fix kits complaining about wrongly set C compilers and
ABI incompatibility between C and C++ compilers.

Task-number: QTCREATORBUG-17165
Task-number: QTCREATORBUG-17166
Change-Id: Ia002490b471e0f5306c3a76b27158869920452ed
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2016-10-27 10:36:02 +00:00
Jarek Kobus
ca4be197ef Revert "Replace virtual isModified method with a getter/setter/notifier"
This doesn't fix the issue with cleaning the clear state of undo stack.
This introduced the issue when ui file is opened it's marked as modified.
It reverts 59c90e00c1
and d0c537ca75

Change-Id: Ifd4ff8483d6c297461632de500a4502b1fd0871f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-21 09:19:56 +00:00
Jarek Kobus
59c90e00c1 Replace virtual isModified method with a getter/setter/notifier
We have lacked the setter and dedicated notifier before.

Change-Id: I58845a48259d260c5cc90ae94b173c79cddcfef9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-17 14:44:08 +00:00
Alessandro Portale
d21d03cff0 Android: Update the SDK download links
Change-Id: Ie83263543b49154a568a8b216d3dfbd87b9902c4
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-09-28 21:13:42 +00:00
Alessandro Portale
ee6b19cb39 Themable, HighDpi Android/iOS device icons
Also used as option category icons

Change-Id: I40916ff4683554a3e7de7126d737286eba4a525f
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-09-27 14:18:04 +00:00
Alessandro Portale
59b7601c58 ProjectExplorer: default icons for IDevice
Enable devices to define their default themable icon.

Kit icons are now by default the Desktopdevice icon,
overridable by the device icon of the kit's device,
in turn overridable by an icon file path.

KitManagerConfigWidget: The browse button for the Kit
icon gets a "reset" action.

Change-Id: I6328ba7d640393aee2c324c592e76b4d5430586a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-26 11:52:00 +00:00
Francois Ferrand
59e7528360 Settings: Regroup all Devices-related configuration pages
Each kind of Device used to add its own top-level preference page, with only a single
tab in each, which makes the list of categories almost irrelevant.

Regrouping all these under the 'Devices' category makes the settings page much more
consistent and reduces the clutter.

Change-Id: I72c04b57004c2e1b1f57208bdaabe8b944390558
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-26 08:11:09 +00:00
Alessandro Portale
e809594fae Core: Make IOptionsPage::categoryIcon a Utils::Icon
This is necessary for themable + HighDPI icons in the options dialog.

Change-Id: I8e3ff87a24591af40bb76b39cd970443d7678fae
Reviewed-by: hjk <hjk@qt.io>
2016-09-20 12:52:49 +00:00
Orgad Shaneh
dd86735111 Android: Use QThread::sleep instead of STL
Change-Id: Ib16e8450732789e801f82e2d037b20868e444538
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-20 09:59:17 +00:00
Eike Ziller
478377d880 Merge "Merge remote-tracking branch 'origin/4.1'" 2016-09-13 10:15:56 +00:00
Eike Ziller
c635c6b50a Merge remote-tracking branch 'origin/4.1'
Conflicts:
	share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml
	src/plugins/android/androidrunner.cpp
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp
	src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.h
	tests/system/suite_WELP/tst_WELP03/test.py

Change-Id: Ibac4d71d4f4dbe1e4f05052d2f8a2dcfd82edd4c
2016-09-13 12:15:09 +02:00
Orgad Shaneh
88aa956bb7 Get rid of Utils::sleep
Replace with std::this_thread::sleep_for()

Change-Id: I3a02fa6d4fc1b41d8d7b01bb3ba0342ce49b8e61
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-13 10:04:55 +00:00
BogDan Vatra
5c34c678f5 Android: API-24 is not unknown anymore
Change-Id: Id0ce6b1fb289e356985d388f4843cffa24ddd77b
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-12 13:44:14 +00:00
BogDan Vatra
258dc5d2e4 Fix debug on Android 6+ with NDK r11+
Task-number: QTCREATORBUG-16721
Change-Id: Ic65f13076794b75d6e4551b68d26fd3752f82098
Reviewed-by: hjk <hjk@qt.io>
2016-09-05 08:07:37 +00:00
BogDan Vatra
84b7e199ac Android: Fix package name search
Android 7.0 ps doesn't add \r anymore to the EOL.

Task-number: QTCREATORBUG-16782
Change-Id: Iff596ac2c1eafd0c5422cbac5708c8b616c73ecf
Reviewed-by: hjk <hjk@qt.io>
2016-09-05 08:05:23 +00:00
Eike Ziller
c56aa52b80 Merge remote-tracking branch 'origin/4.1'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/qmakeprojectmanager/makestep.cpp
	src/shared/qbs

Change-Id: If1787ed23afa786ed2cef57f53c1db642559cbe0
2016-08-31 14:40:38 +02:00
BogDan Vatra
1ca42e24cb Android: Make avd name extraction even more robust
The console output changed even more and now it add one more "OK", in
order to get the right avd name we should stop searching at last "OK".

Task-number: QTCREATORBUG-16783
Change-Id: I2b69763bba740b739e3573fdfae6b6ac9ed16e95
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2016-08-29 08:37:08 +00:00
Vikas Pachdha
23c36076da Handling minimum required Android API level for Qt 5.7
The build breaks now with a clear warning if the minimum API level set is less than the minimum required by the kit.
The device dialog also used to show incorrect devices on the first compile cycle in case of the missing manifest file. Now
stock manifest file is used from the kit to analyze the minumun API level for the devices

Task-number: QTCREATORBUG-16740
Change-Id: Icd4d8209dad870cba5f99af1dd700830517f9294
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2016-08-24 11:59:13 +00:00
Tobias Hunger
5097acebf3 Keywordscompletion: Code cosmetics
Change-Id: I2f25894d5043ea1f5ab50ab6b48ce6b02ab4b987
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-08-23 12:12:32 +00:00
Ulf Hermann
e0d7089f94 AndroidRunner: Process "ps" output on the device, not in Qt Creator
Previously, the code depended on the device to send the whole "ps"
output back quickly after "ps" was written to the shell. If the output
was not there by the time the input was considered written by Qt
Creator, we would mis-parse the port and generate wrong conclusions on
if the process was actually running or not.

By filtering the correct line from the ps output on the device and
outputting a clear negative result when none is found we can determine
the "running" status of the process more easily. Each output line
directly corresponds to the state of the process at the time when ps
ran. We buffer the output in order to guard against lines being broken
up during transmission.

Change-Id: I0e1726b7f0d725d982a0f2d60d0c8ab7d59fc371
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-08-18 09:40:46 +00:00
Ulf Hermann
2044a33f88 AndroidRunner: Remove _(...)
We don't need to do this for plain character literals as we allow
casting those to QString now.

Change-Id: I25569cfb8a2ff618176b7d5ab048f03ecaaee460
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-08-18 09:32:43 +00:00