Commit Graph

66760 Commits

Author SHA1 Message Date
Jarek Kobus
557a09ba4c Don't pass explicitly the QFutureInterface into Utils::runAsync
Don't pass the QFutureInterface by lambda capture to the lambda.
Instead, define additional argument to the lambda. The
QFutureInterface will be instantiated by the runAsync itself.

Change-Id: Id3a12f306e91f76239134312bb46f7d8aefd03a4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-11 11:42:17 +00:00
Johanna Vanhatapio
450f417c0b Doc: Update Using 3D Components
Task-number: QDS-3087
Change-Id: I24d186bed1f5af475c9f641eab323df06e14b3bd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-11-11 11:41:58 +00:00
Orgad Shaneh
203a3138b6 Utils: Replace use of deprecated result_of_t
Fixes MSVC warnings.

Change-Id: Id9b44c211a29e2bc1776a8d341a16b5bb2e8d75e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-11 10:45:14 +00:00
Orgad Shaneh
9c6df2f832 Fix implicit size_t -> int MSVC warnings
Change-Id: I2f224c942c52a172788e917641420e8380c54859
Reviewed-by: hjk <hjk@qt.io>
2020-11-11 10:42:07 +00:00
Marco Bubke
6fc3f65ce0 Sqlite: Add swap for ConstIterator
Otherwise we get an recursion.

Change-Id: Ia8dfcbeae30b25d9d347404ae85b852c4c11c921
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-11-11 08:42:16 +00:00
Assam Boudjelthia
9d5ab6ef4b Android: show image type for each android version in New AVD dialog
If the user has multiple installed system-images for the same type of
device and same Android version, it might become confusing to know what
to choose.

Change-Id: I9be7f55731448efb47a6ab79e45f7f1717ade3eb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-11-11 07:50:36 +00:00
Eike Ziller
9d38e22a9f cmake build: Copy/install correct branding file
When changing branding, we need to copy and install that different
branding file instead of the standard one.

Change-Id: I3a2f8391b5e5ed1c4c79b81294ed6221df5e7ddc
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-11-10 15:52:21 +00:00
Christian Kandeler
f7399d520e QtSupport: Do not prefer Qt4's uic unconditionally
A Linux distribution with Qt4 and Qt5 installed will typically have uic
and uic-qt4 present in the same directory. Our code always preferred
uic-qt4, even for Qt5, leading to potentially invalid code in the
generated ui header file.

Fixes: QTCREATORBUG-17739
Change-Id: Icf509de4e2fbee1d51fd049a8cf5a27d1ac5190b
Reviewed-by: hjk <hjk@qt.io>
2020-11-10 15:21:35 +00:00
Marco Bubke
d1d95e78d6 UnitTests: Fix double deletion
Change-Id: Id28f739a3f6b0c200386edf67914886ae06e2999
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-10 14:41:54 +00:00
Marco Bubke
2a2dfbec73 QmlDesigner: Add states to ImageCache
Task-number: QDS-2998
Change-Id: I8e65881181ae1010ef1f8bab92fa71d92c961bcd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-10 14:35:12 +00:00
Marco Bubke
2ee63af4cd UnitTests: Setup an environment for every test run
So there are no old file an temporary file.

Change-Id: Ida22703b5842b094f9a0f26562cd0908542e044f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-10 14:34:18 +00:00
Marco Bubke
f90bc7fa37 QmlDesigner: Improving SessionChangeSets
Task-number: QDS-2998
Change-Id: I9b559bf593dd968172649d1f6c45fb9fb454f1a5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-10 14:32:39 +00:00
Marco Bubke
c3aad50184 QmlDesigner: Add waitForFinished to ImageCache
Task-number: QDS-2998
Change-Id: I5ffb63b7345a17ccb499db876bb4dbb0a946ed85
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-10 14:32:30 +00:00
hjk
0eb65f7211 ProjectExplorer: Set focus to TargetSetupPage when shown
This ensures the "Configure Project" button can be activated
with <Return>

Fixes: QTCREATORBUG-20720
Change-Id: Ib20848cf2b4a1a2fcd33f9652a9a09796fd85c54
(cherry picked from commit b1d3eee42d)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-10 12:31:47 +00:00
hjk
913490a4e4 ProjectExplorer: Add shortcut to "Configure Project"
Note that this does not work with 'Return' immediately, as the focus
is usually on the left tree view in that situation. <Tab>, <Return>
work.

We can try to switch the focus by default in a separate patch if
that is wanted.

Task-number: QTCREATORBUG-20720
Change-Id: Iefbf7f2c1493947b847fd9c89e86b4de56a65543
(cherry picked from commit 08f3696f21)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-10 12:31:26 +00:00
hjk
289a18f56f FakeVim: Change shortcuts from Alt-V,X to Alt-Y,X
Alt-V is taken by the Views menu nowadays.

Also, fix the instruction to quit FakeVim on Mac.

Fixes: QTCREATORBUG-24694
Change-Id: I5268760f45e34f973b3b38b19d2577c0c655b000
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-10 12:29:14 +00:00
hjk
eb45b8f9b9 Avoid more uses of non-explicit QChar(int) constructor
Will be gone in Qt6.

Task-number: QTCREATORBUG-24098
Change-Id: Id76b15bb11879b2e8ff0f71af45acbfb1720f763
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-10 12:27:36 +00:00
Eike Ziller
8edae33b42 macOS: Fix deployment of QML2 imports
Amends e101e83f84

Change-Id: I43ee85d9e0c144ec9a25d811d17604c91e709cd8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-11-10 12:08:06 +00:00
Eike Ziller
8f4a9d8e9b litehtml: Add method for retrieving current html content
For squish testing.

Fixes: QTCREATORBUG-24903
Change-Id: Id9b21c6be306db9b3ed0e70c23923f39fae2d210
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-11-10 10:34:19 +00:00
Eike Ziller
5dff6434e5 Move translations README to markdown and adapt for CMake
Change-Id: I7c66afbd8cf84ec9cfe9bfe22e8cacf47d9f2bf8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-11-10 10:33:50 +00:00
Eike Ziller
88498101a0 Build scripts: Fix path format for cmake calls
Make sure to pass posix style paths to CMAKE_PREFIX_PATH,
CMAKE_MODULE_PATH and CMAKE_INSTALL_PREFIX. Otherwise this can lead to
funny "Unknown control sequence \U" kind of errors.

Follow-up of fceaff1a6f

Change-Id: I1c8445f9c298a17115bca6b42f099a99e33d6de2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-11-10 09:50:23 +00:00
Christian Kandeler
ad48f2639c ProjectExplorer: Consider build environment
... in "Open Terminal Here" action in the build configuration.

Change-Id: I0b1b15d4f1097cf48eb5a977f2ca5951b2f78377
Reviewed-by: hjk <hjk@qt.io>
2020-11-10 09:01:48 +00:00
Eike Ziller
6813d14872 Fix build against Qt6 with GCC 7 / Linux
Add some missing includes for otherwise incomplete types.
Make LanguageServerProtocol::JsonObject's iterators and end() methods
public. Otherwise QMetaType fails for
LanguageServerProtocol::ServerCapabilities which is used in a signal
from LanguageClient.

Task-number: QTCREATORBUG-24098
Change-Id: Id7f8a4146afb927a8589fadaefe42f7fbca45dd3
Reviewed-by: hjk <hjk@qt.io>
2020-11-10 08:25:46 +00:00
Orgad Shaneh
3122a1bfc5 Aspects: Remove some more default values
Change-Id: Iadee8b8f1eeb3ff009a667d45a51f6f5a94329ca
Reviewed-by: hjk <hjk@qt.io>
2020-11-10 08:06:51 +00:00
Leena Miettinen
ac6bfd0620 Doc: Fix changed IncrediBuild settings accordingly
Change-Id: Ie704bea887bf77461be07f7332087e2413134e09
Reviewed-by: hjk <hjk@qt.io>
2020-11-10 07:37:18 +00:00
Tim Jenssen
6edf6e4dc1 qmldesigner: add missing includes
Change-Id: I3f8ebb842e857525f444d950e5886a8cd3c0320c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-11-09 21:10:51 +00:00
Henning Gruendl
f66e2f508f QmlDesigner: Fix navigator selection issue
* Fix navigator selection issue caused by clicking on icon columns of
  a locked item
* Fix visibility icon in icon font
* Remove redundant selection behavior call

Change-Id: I03c97b22d92bcf0760b2b9ec627609624a0b3695
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-09 19:37:58 +00:00
Tim Jenssen
fceaff1a6f cmake expects forward slashes here - even on windows
Change-Id: Ia31727b703745e01d6def91237a0bc46ea37261a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-11-09 17:35:51 +00:00
Aleksei German
d4653175e4 QmlDesigner: Return Annotation context menu action
Addition to QDS-2970

Change-Id: I92834e047ba76c2cfbfb0f6a10cbd7618cb0dbe7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-09 17:23:29 +00:00
Jarek Kobus
4c7032fb1e Make CppProjectUdpater a final class
Silence the warning:
"Call to virtual method 'CppProjectUdpater::cancel'
during destruction bypasses virtual dispatch".
CppProjectUpdater's d'tor calls cancelAndWaitForFinished(), and
the latter calls in turn virtual cancel() method.
As long as we don't have subclasses of CppProjectUdpater,
calling a virtual cancel() from the d'tor should be safe.

Change-Id: If2ebe6a190649319401d4e4b0f6977f547c51dac
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-09 15:25:13 +00:00
Mahmoud Badri
91ad88205a Optimize checking keyframes in clipboard
Old implementation is expensive (~200ms) and this method is called
frequently. Also prevent pasting keyframes in the FormEditor.

Change-Id: Id083b553231893be31c7aab1d0da1809529316c8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-09 15:08:57 +00:00
Eike Ziller
6514e1b866 Fix lupdate issues
Change-Id: I1971f74a54e4afe2d106c105f6b38f415bef488f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-11-09 14:55:56 +00:00
hjk
864a3fa0e7 Incredibuild: Change some of the displayed strings
Change-Id: I7638be248031c8262e3d0adf92479fdd6c1fb5f4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-11-09 14:22:28 +00:00
Orgad Shaneh
836fbed090 Aspects: Remove keys with default values
It was done for some of the types, but not all. This reduces a lot of noise
from the output file.

Change-Id: I64a99e7725ad7cca1f0d90dc296c58c71334ecff
Reviewed-by: hjk <hjk@qt.io>
2020-11-09 13:37:46 +00:00
Christian Kandeler
e41f3eb607 CPlusPlus: Fix "find usages" categorization for sizeof and array access
Task-number: QTCREATORBUG-24894
Change-Id: I65fa097785b19e181f15178ad6d30608899316c0
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-11-09 12:50:07 +00:00
Orgad Shaneh
79b0d2bbf5 ProjectExplorer: Add a missing emit
Change-Id: I8eae3f6eca24f6014825354141be377acd20990f
Reviewed-by: hjk <hjk@qt.io>
2020-11-09 12:43:58 +00:00
Leena Miettinen
9688f33a5d QML Preview: Fix UI text
Fix capitalization and make some strings shorter.

Task-number: QTCREATORBUG-24873
Change-Id: I78d0d1507774ab732f633f8849a3f45f6835110f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-09 12:42:25 +00:00
Orgad Shaneh
51131848ba Aspects: Do not store values with empty keys
Change-Id: I9e8b62915a2278fc3ab35e8b09a330bc0a52e4ae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-11-09 12:21:13 +00:00
Eike Ziller
743877730b cmake build: Fix branding
The cmake build used IDE_ID in too many paths that are actually
not branded (yet?).

Change-Id: I019dd806975ef2205aa946bc3b27b0675233e1ea
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-11-09 11:04:50 +00:00
Leena Miettinen
bc9711f4cf Conan: Fix UI text punctuation
Task-number: QTCREATORBUG-24873
Change-Id: I92c255218fddd985857e43025349855f2e7975ec
Reviewed-by: hjk <hjk@qt.io>
2020-11-09 10:59:42 +00:00
Christian Kandeler
42d34015e2 CPlusPlus: Provide information about the "static" specifier
... to the function type.
This fixes the issue for function *definitions*. For function
*declarations*, we need to amend the parser.

Task-number: QTCREATORBUG-24894
Change-Id: I02043d8b974c2c64dcd739c7e05ce44fd277b5d3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-09 10:55:38 +00:00
Leena Miettinen
1e2939916e Qt Quick Designer: Fix UI text
Fix capitalization, punctuation, style, and typos.

Task-number: QTCREATORBUG-24873
Change-Id: Iecf7781d604b799563457cf000ab5f48e06b251c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-09 09:56:49 +00:00
Leena Miettinen
f2254419af Project explorer: Fix UI text
Fix punctuation.

Task-number: QTCREATORBUG-24873
Change-Id: I5cc5e80915b891efa2cd2268e3302feb39b7a576
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-09 09:52:12 +00:00
Christian Kandeler
1988d89198 CPlusPlus: Check for static member functions in FindUsages
Static member functions cannot modify the object and therefore must not
be reported as writable references.
Note that this does not have an effect yet, as the function type lacks
information about the "static" specifier.

Task-number: QTCREATORBUG-24894
Change-Id: Ib04a17864a0ca5b7610579a2f5efbcfde257e08a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-09 09:51:08 +00:00
Jarek Kobus
fdaed3aa09 Fix qmake build against Qt 6
Change-Id: Iee5154e5b48c1e7f41d682f2ec7040202366db77
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-09 09:22:28 +00:00
Leena Miettinen
c742f0ac9a CMake: Fix UI text capitalization and punctuation
Task-number: QTCREATORBUG-24873
Change-Id: I2672d0360cc8a6b41f711ca9db0f76750639da4e
Reviewed-by: Asit Dhal <dhal.asitk@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-09 09:07:30 +00:00
Leena Miettinen
2bb1ff6077 CPP Editor: Fix UI text capitalization
Task-number: QTCREATORBUG-24873
Change-Id: I166b2aa8867e694d0b3ba1756edd0afc6e487211
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-09 09:07:19 +00:00
Leena Miettinen
8362c3924c VCS Manager: Fix UI text style
We are trying to move to using shorter text.

Task-number: QTCREATORBUG-24873
Change-Id: I984c1cbc7fe31e74fc1ec90e500bbec3bd2b429c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-09 09:07:06 +00:00
Andre Hartmann
c922709f33 Designer: Fix escaping '&' again
It seems impossible to show a single '&' character
on UI elements, as this character is also used for
the mnenomics.

So having a single '&' followed by a space creates
a space character, having two of them ("&&") creates
an underlined '&' (seen on Windows and Linux).

So let's just work around this long-living issue
and avoid the abbreviation.

Amends commit bc37a9ab7d

Change-Id: Ibcbfcac62d7be8c091ab2fc51621bddc9dad7e00
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-11-09 08:23:50 +00:00
Aleksei German
4e4ec44a5d QmlDesigner: Fix tests build
Change-Id: I65190e74a3dfb76991650463bf91b40a285d7384
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-11-06 16:36:58 +00:00