Commit Graph

67787 Commits

Author SHA1 Message Date
Eike Ziller
8f75638dc9 Merge remote-tracking branch 'origin/master' into 4.13
Change-Id: I918d82b4e11cc9aa3c361bb439019403b93afa96
2020-06-29 09:32:49 +02:00
The Qt Project
1f1dca9ec7 Merge "Merge remote-tracking branch 'origin/4.13'" 2020-06-29 07:31:44 +00:00
Vikas Pachdha
fbb1fb3bf2 AssetExport: Notify parser failure
Change-Id: I76ed8b423c91b4ba3d5287153016ea6f1a820c8a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-06-29 07:30:56 +00:00
Vikas Pachdha
cc7e542825 AssetExport: Dump imports to metadata
Task-number: QDS-1556
Change-Id: I020515e792cd12372ecef842eac01862a096543b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-29 07:30:35 +00:00
Tobias Hunger
c0bbbc2f70 Wizards: Update CMakeLists.txt files to handle Qt 6 and Qt 5
Update wizards to produce CMakeLists.txt files that can work with both
Qt 5 and Qt 6.

Bump minimum CMake version to 3.14 since that is the first version that
accepts Qt with major version 6 in AUTOMOC/AUTOUIC.

Task-number: QTCREATORBUG-24206
Change-Id: I2ff462e67f01d84939c02be579579f358bc0b20e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-06-29 07:29:31 +00:00
Eike Ziller
40a14070d3 Merge remote-tracking branch 'origin/4.13'
Change-Id: Ie67085fcbb4150c60f0253312e19a82b95b4a898
2020-06-29 09:01:31 +02:00
Eike Ziller
569ad98852 CMake build: Fix library version numbers on macOS
The plugin libraries got version 0 and compatibility version 0
and libraries compatibility version 4.0.0,
which is not compatible to plugins built with qmake and the runtime
linker prevents loading.
Use the correct IDE_VERSION and IDE_VERSION_COMPAT.

Change-Id: I9a17627c5d212052df644bbc6711dc8fb8307315
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-06-29 06:58:46 +00:00
The Qt Project
018e4aa197 Merge "Merge remote-tracking branch 'origin/qds-1.59' into 4.13" into 4.13 2020-06-29 04:38:48 +00:00
Assam Boudjelthia
c90d1c61ce Android: recommend AdoptOpenJDK in settings UI and docs
Show JDK downlaod button on Linux and point it to OpenJDK becuse
it's the most used on Linux. Otherwise, recommend AdoptOpenJDK because
it works on all platforms and easy to install as well.

Change-Id: I94fd61262fe759b96db59a9e2abfbd063f6795f0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-06-26 20:06:32 +00:00
Alexis Jeandet
2caedc7134 CMake/Doc: fix small typo in link
Change-Id: I1dcefbe25bff1faedf77175770ee7e2521101924
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-06-26 15:49:53 +00:00
Tim Jenssen
b8cd87dea0 Merge remote-tracking branch 'origin/qds-1.59' into 4.13
Conflicts:
	src/plugins/clangformat/clangformatplugin.cpp
	src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
	src/plugins/qmldesigner/qmldesigner.qbs

Change-Id: Ie4a0beeb9fd32ac9683f4e8769988a9c3f3e369a
2020-06-26 16:51:22 +02:00
Vikas Pachdha
2faa1e2933 AssetExport: Add unique identfier to all exported nodes
Task-number: QDS-1556
Change-Id: If70b8dc2e4f02a88ba0835e2fc3a547f1e992ea5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-26 14:32:33 +00:00
Michael Weghorn
70c4889ac9 Debugger: Show text representation for 'char *' typedefs etc
'tryPutSimpleFormattedPointer' takes care of nicely
showing the actual string representation of character
arrays if the innerType is one of 'char', 'signed char',
unsigned char', 'CHAR'.

To make this work for typedefs of those types as well,
first resolve the typedef before passing the value to
'tryPutSimpleFormattedPointer' from 'putFormattedPointerX'.

This e.g. improves the display of variables of type
'const gchar *'.

Fixes: QTCREATORBUG-24264
Change-Id: I477b6d7552f9c30c12d819aa5f37e64e4f444969
Reviewed-by: hjk <hjk@qt.io>
2020-06-26 14:14:23 +00:00
Artur Shepilko
1522dc98c1 Qmlpuppet: Remove an explicit bool type for fitAndHideBox() function
Explicit return values in qml functions cause errors in some Qt
versions, so remove the need for it.

Change-Id: Idd3035b19b56c25e94bc846c3de8f7aa5381e1eb
Reviewed-by: Artur Shepilko <artur.shepilko@nomadbyte.com>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-06-26 13:57:15 +00:00
Miikka Heikkinen
2949504a9d QmlDesigner: Fix draggable priorities in 3D edit gizmos
Upped default priority of all directional draggables a bit to make
them preferable to free rotation ball.

Change-Id: If934cb723e8c1a8ca9a114d71b19cbfc196e2682
Fixes: QDS-2286
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-06-26 13:56:52 +00:00
Tim Jenssen
5a06305ffe qmldesigner: enable Transion in QmlUi files
Change-Id: I2e35e8a2dc7b946297c70fd775bd3e3366295271
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-26 12:38:18 +00:00
Thomas Hartmann
e245abec9e QmlDesigner: Increase precision for float properties
The precision for float properties in QML was quite low.
We keep the reduced precision for a few known 2d related
properties, but increase it in general.

Task-number: QDS-2190
Change-Id: Ie82ac03485aa52f9b400151153ccaf37a80e39b0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-06-26 12:32:32 +00:00
Thomas Hartmann
951c112fcc QmlDesigner: Simply use qFuzzyCompare
I think this was done to avoid "ugly"
floats, but any rounding should be done in the rewriter.

Task-number: QDS-2190
Change-Id: Ibc5fc2609b5ac332191b68fe17d76d9afca21f40
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-06-26 12:32:18 +00:00
Alessandro Portale
97ac63b401 Android, McuSupport: Change "download" icons to "online"
The download icon might suggest that clicking that button causes an
automated download/installation. Since we have similar automation in the
Android settings, that could be misleading.

Change-Id: Ia1e4f1cfe15f79daf090546ee7c991f93b23fd13
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-06-26 11:18:40 +00:00
Christian Kandeler
a6098c6b2b CMake: Fix compiler warning about unused lambda capture
Change-Id: Ie95512a247997764d41ca5c5f8ba4cb576f634aa
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-26 11:08:32 +00:00
Christian Kandeler
22830fd5e2 Tests: Fix deprecation warning
Task-number: QTCREATORBUG-24098
Change-Id: Icea21e446173537d8fdb8113f1eff7d7176c34b3
Reviewed-by: hjk <hjk@qt.io>
2020-06-26 10:31:18 +00:00
Vikas Pachdha
3fde0a19ec AssetExport: Add generated UUID to qml
This will enable the merge when importing back from Photoshop

Task-number: QDS-1555
Change-Id: I411ad65af1a33a80fcea80206aef93e2d1afa357
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-26 10:26:56 +00:00
Vikas Pachdha
9daf5c130d AssetExport: Export assets from renderable nodes
Task-number: QDS-1555
Change-Id: I3d5b60ee8214aeee054587f45045beea020d1f13
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-26 10:26:43 +00:00
Vikas Pachdha
000281fed7 AssetExport: Refactor to accommodate asset generation
Change-Id: I57b33dc06819b3f0d1269eae10bd1131c5cb911d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-26 10:26:21 +00:00
Assam Boudjelthia
c51bbc3ea7 Android: partially revert 03f6517a6a
Change-Id: Id2d3658343be765a5f131f48f11ee7cced67afb3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-06-26 10:25:45 +00:00
Assam Boudjelthia
5c5c505910 Android: validate jdk path at start and reload sdkmanager after that
* Validate Jdk path at the start to avoid showing valide settings on
empty path.
* Reload sdkmanager after jdk path is changed to reflect changes.

Change-Id: Ib5eafead9d4f695cf79c55b79866bd3269dadbd5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-06-26 09:52:28 +00:00
Leena Miettinen
004bef4909 Doc: Update entry-level tutorials
Fixes: QDS-2304
Change-Id: Ib3417b40a19767d79b36bd920d21ae50b903a554
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-26 09:52:20 +00:00
Assam Boudjelthia
b410def067 Android: fix some issues with jdk path detection
* There were two functions to detect jdk path, unified them.
* First try to find jdk 1.8, if not found, look for newer versions.
SDK Tools version 26.x needs jdk 1.8 however, the new cmdline-tools
can work with the newest jdk, so the UI will warn the user if the
selected jdk cannot run sdkmanager potentially because of the jdk
version.

Change-Id: Iee2c378598c26e8a9a8245262110ac20322a2d2b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-06-26 09:52:17 +00:00
Thomas Hartmann
454ff4c46b QmlDesigner: First implementation of TransitionEditor
Change-Id: I14391e872f6a257a2cdf75e7d577de64c384c1fd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-06-26 09:44:08 +00:00
Thomas Hartmann
4e9b6d68c1 QmlDesigner: Break dependencies in the timeline graphics view
This allows to reuse big parts of the timeline infrastructure.
To allow this I introduced AbstractScrollGraphicsScene and other view
can derive from it to implement similar behaivour.

Change-Id: I4a4d2d5711d4a4fbb4cf7af29f689459ccf89f00
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2020-06-26 09:43:49 +00:00
Assam Boudjelthia
ef9f57b5cb Android: remove unused function
Change-Id: I9c267c9dd979ae02070b08d5d95099846749eb2f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-06-26 09:11:52 +00:00
Christian Kandeler
7fad01eb02 QbsProjectManager: Consider cpp.distributionIncludePaths
... and pass them to the code model.

Fixes: QTCREATORBUG-24162
Change-Id: I4f33bba659fca957c56f2fcb4b8adce28533074b
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
2020-06-26 09:00:32 +00:00
Christian Kandeler
db2f2f92b6 Clang-cl: Consider MSVC 2019
Fixes: QTCREATORBUG-24167
Change-Id: Iff6e98c5cb404c67dce796ad6f7225f97caa4184
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-26 08:59:38 +00:00
Christian Kandeler
832eb5c5a3 Help: Fix clang warning about unneeded copy
Change-Id: I0526245773be1dcc71f7ed28e9c5113f20b66df6
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2020-06-26 08:54:41 +00:00
Ville Voutilainen
64896a9436 Android: parse image file names from manifest
Also scales splash images without stretching and reflects them
to other orientations.

Task-number: QTCREATORBUG-24149
Task-number: QTCREATORBUG-24150
Change-Id: Ie23a8ba5f75132971673d3232807e941dfd50f97
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-06-26 08:39:56 +00:00
Assam Boudjelthia
03f6517a6a Android: use text button for openssl download instead of icon only
Change-Id: I37dd0076c9dad78f8e40921facfec62a7363c27c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-06-26 08:38:54 +00:00
hjk
0283c5cab9 Meson: Adapt to FileName deprecation
Change-Id: I68bc2c7532f74b0377a8030efbaa59abcfccec45
Reviewed-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-06-26 08:28:13 +00:00
Tim Jenssen
02d982dc8d qmldesigner: remove unreferenced variable
Change-Id: Id76291e2621744a91ae4eb78d3941086ee7facd7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-26 08:19:11 +00:00
Tim Jenssen
a8ac06a852 qmldesigner: reduce noise
removes unnecessary:
"PropertyEditor: invalid node for setup"
while reseting the view.

Change-Id: Ib4583e97ed5a52ff87116e4231f4bf6b4f4cc7e5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-26 08:19:03 +00:00
Alessandro Portale
806f7ed68f Android: Set the icon size in NDK list widget to 16px
Change-Id: I2881a3cb355236a7be7d0f803f96f90501b02b6e
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-06-26 08:11:24 +00:00
Thomas Hartmann
cd622fd0a7 QmlDesigner: Reset focus also for objects not derived from Item
Task-number: QDS-2369
Change-Id: Ifa9ce163751bad0de09db5d35f77609210dd0ac5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-06-26 07:59:24 +00:00
Christian Kandeler
6ac416fc81 Target Selector: Do not repeat kit name in context menu
Kit names can get rather unwieldy, and there is no point in repeating
them in this particular context menu, where the user clicked pretty much
right on the kit name.

Fixes: QTCREATORBUG-24242
Change-Id: I04d96e53ece24fd6c54d8aa225d13a0c7354acd0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-26 07:30:19 +00:00
Assam Boudjelthia
af7c218d95 Android: remove native sdk and avd manager buttons
The native SDK and AVD manager buttons are no longer useful, since the
original, visual Java-basd tool for managing SDK and AVDs were removed
from Google's offering. The replacement is a set of command line tools
and a visual tool within Android Studio, which can not directly be
launched from Qt Creator.

Qt Creator has it's UI on top of the command line tools.

Change-Id: If660d7f566c173f46d9b2a97c9204746d33270e6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-06-26 07:15:07 +00:00
hjk
dbca372780 QmlPuppet: Fall back to pre-Qt5.2 for QVariant comparison
Change-Id: Ibf55561e01f50ec7d689d40b50d100b8d257aa80
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-26 07:11:16 +00:00
Thomas Hartmann
003282c6f5 QmlDesigner: Fix crash on puppet
Change-Id: I233d3dab5a509bfd7c9a30c7dcc15dcf8751f456
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-26 06:48:26 +00:00
Assam Boudjelthia
0bf5ca1b3e Android: rephrase few UI elements in deployment settings
Change-Id: Ief4cf44eda3342f35f828a4a1388ec45fafe8b4a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-06-25 19:55:17 +00:00
Assam Boudjelthia
7acb0d223c Android: describe the warning of am start args more
Change-Id: I12312bfe2aaf7f56be31a9513833a65cba2b036f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-06-25 19:54:13 +00:00
Eike Ziller
bc4c2f8a15 Use the packaging script for the github action
Unifies a bit of what is done. For example this adds documentation and creates a disk image for
macOS. It will also make adding perfparser/elfutils and 32bit wininterrupt and qtcreatorcdbext
easier.

Adds Qt translations.
Adds some useful options to build.py and make it work with python3
Disables detection of debug vs release build in deployqt.py on Windows
if dumpbin is not there (for MinGW).

Change-Id: I3cc33144cad653823321209c219d220eb75093ec
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-06-25 16:37:28 +00:00
Artur Shepilko
5b53ac9661 Fix compiler warnings about several unused variables
Change-Id: Ic236efdfdfd997719187eec1c19ad2b7f6c044df
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-25 15:23:25 +00:00
Henning Gruendl
131b672f55 QmlDesigner: Fix initial workspace change
Task-number: QDS-1766
Task-number: QDS-2207
Change-Id: Ibc86b4cf5914cb10e8917198095b90073b159290
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-25 13:35:20 +00:00