Commit Graph

63610 Commits

Author SHA1 Message Date
Robert Loehning
46e5d52238 Squish: Update addAndActivateKit
Fixes warning in tst_opencreator_qbs

Change-Id: I82ba025ebc6befd222dd8f47cabcff08ad2e584e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-18 14:41:41 +00:00
Christian Stenger
5721ccb03b QmlDesigner: Fix build with tests
Amends c81d672bb0
and a854e0daa8.

Change-Id: I85d293a2abc437613be924084480a173190bda8b
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-18 14:02:48 +00:00
David Schulz
b9af9881a9 LanguageClient: update semantic highlighting only if server supports it
Task-number: QTCREATORBUG-23599
Change-Id: I76c804b51362ad6ab2aecf0631a16289a33e4810
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-18 12:03:29 +00:00
David Schulz
909cb3859b Editor: update proposal widget after editor contents changed
Also when text is removed via shortcuts.

Fixes: QTCREATORBUG-15038
Change-Id: I1c78b9306594fbf13378a55b27be18769de141a6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-18 12:03:07 +00:00
hjk
644f1e4faa Android: Un-export CreateAndroidManifestWizard
Not needed outside.

Change-Id: I390802c73d3d8c2a3fa95bc24e944913cea49393
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-02-18 11:58:09 +00:00
hjk
b18fceb15d Android: Pass BuildSystem to CreateAndroidManifectWizard
Instead of a Target and hoping that its activeBuildystem is the
right one.

Change-Id: Ieb384d89e8f580b24205ce46a38f151aa72e2f6e
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-18 11:56:23 +00:00
hjk
7ba45c66ff Android: Remove one more buildTargetSdk() finding roundtrip
... and avoid the implicit used of Target::activeBuildConfiguration()
there,

Change-Id: I08ec72be601ef7b854b5aec5784b0636c738faa4
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-18 11:19:56 +00:00
hjk
4bd316ab62 Android: Access buildTargetSdk directly when possible
Change-Id: I1f9996919d982f8e54c595abaa44ed0e10a79422
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-18 11:14:12 +00:00
Eike Ziller
75972f04f6 Merge remote-tracking branch 'origin/4.11' into 4.12
Change-Id: I0d2977a2ed6f73cbc1e3cb5f1bf7e2e923a35305
2020-02-18 12:14:02 +01:00
Eike Ziller
cde9f31068 macOS: Fix signing issues with notarization
Notarization requires signing with hardened runtime, but this added
requirements to the additional plugins we copy into Qt Creator for the
commercial package.

This patch fixes an issue with an absolute RPATH still being left in
extra plugins, and avoids copying plugins into an already signed
application by not signing the 7zips, but only the contents in the open
source disk image (and the installers are signed by the installer jobs
anyhow).

Change-Id: I8c945a0ad9df610b20a8ee110320875f255c65b4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-18 10:24:45 +00:00
Eike Ziller
e2fad3afa4 doc: Fix qdoc warnings in aggregation
Change-Id: Ia9a2e6dcdb8dc82ae600b974e396fd8ac3a42678
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-02-18 10:02:48 +00:00
Christian Kandeler
a854e0daa8 QmlDesigner: Fix qbs build
Change-Id: I037fe18974e1fcf10c0899c051ebbc1d9142afc4
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-17 18:53:01 +00:00
Assam Boudjelthia
67df868f5c Android: Automatically use the correct NDK for each Qt version
Based on change 286266, we can find a correct NDK version for Qt for
Andriod version. This change allows Android plugin to get relevant NDK
information and registers appropriate toolchains and kits settings.

[ChangeLog][Android] Automatically use correct NDK version
corresponding to used Qt version.

Task-number: QTCREATORBUG-23583
Change-Id: Ic6b0d7a1ae8962c075b77498de88e018a008ac3e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-17 16:14:50 +00:00
Eike Ziller
6b7effa02a Merge remote-tracking branch 'origin/master' into 4.12
Change-Id: If4508ed26484913d803cdf9d4c06831ec4e98ae7
2020-02-17 16:49:43 +01:00
Eike Ziller
bf25c21eb0 Merge remote-tracking branch 'origin/4.12'
Change-Id: I333037e56be7280b86ce577ea63393245c28c09d
2020-02-17 16:47:06 +01:00
Leena Miettinen
8046e3311f Doc: Fix QDoc warnings in Find classes
- Document BaseTextFind and FindSupport
- Mark undocumented classes and namespaces \internal
- Add and fix docs for IFindFilter, SearchResult, and
  SearchResultWindow

Fixes: QTCREATORBUG-23600
Change-Id: Ic9445f7f15562f114f4cbd9fe16988d7249d48db
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-17 15:45:51 +00:00
Eike Ziller
a467e34e58 Fix qdoc call after it moved to LLVM/Clang
For some unknown reason qdoc does not add the include paths for
Qt modules, so we need to do that manually.
Also, if we do that, we need to pass it the default include paths, so
standard C++ headers are found.

Qt includes and standard headers are found now, but

Framework style includes on macOS still fail ("QtCore/QString"), which are
used in Qt headers as well. Looks like the framework path that is passed
with -F to qdoc is not passed on correctly.

Task-number: QTCREATORBUG-22451
Change-Id: I04b2c75ecdeb1f0e70ba9adfea039f0ff16ec96b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-02-17 15:45:48 +00:00
Leena Miettinen
d06eee5218 Doc: Fix QDoc warnings in Core plugin dialogs classes
- Fix IOptionsPage class docs
- Mark PromptOverwriteDialog and ReadOnlyFilesDialog

Fixes: QTCREATORBUG-23608
Change-Id: I6a646f0bd68230a7c5f80bd748bda20729f23b74
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-17 14:56:39 +00:00
Eike Ziller
086b4eef07 Plugin wizard: Enable building against Qt Creator snapshots in github workflow
Change-Id: I36a6ffb878c5bc6a59219424cab5b71bdc12bf33
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-02-17 14:51:04 +00:00
Aleksei German
c81d672bb0 QmlDesigner: QDS Annotations
- Extended Auxiliary data support for Annotations
 - Extended Model Node interface
 - New Tool created
 - Form Editor & Property Editor visualization

Task: QDS-39
Change-Id: Idf15f9b295cb2b977fd5557acffbd40757f13a8e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-17 14:50:17 +00:00
Christian Stenger
4205134847 Squish: Fix compiler toolchains on macOS
Change-Id: I95aa7f0c91bc538ec7ada3ea04a8285b5cbe5f9c
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-02-17 14:06:31 +00:00
Andre Hartmann
da42176da8 QmlPuppet: Fix unused parameter warnings
Change-Id: I3bd5f921a3ca1f6067fac6e232f383f0b1be5463
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-02-17 13:50:50 +00:00
Andre Hartmann
fff7e32877 OutputWindow: Cleanup and modernize
Change-Id: Ie78c84e2677cabb144cfc678e5d1007fcae1f33a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-17 13:48:57 +00:00
Andre Hartmann
30359f725e OutputWindow: Reduce scope of local variable
Found by cppcheck.

Change-Id: I597021ddb3317cf6320bf25eb2d52141fa1e4f80
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-17 13:48:45 +00:00
Alessandro Portale
4960b2ac2a Android: Use FilePath::fromUserInput for user input
... or when reading non-Qt config files. FilePath::fromString would make
FilePath keep native dir delimiters, which would cause wrong negatives
for example in FilePath::isChildOf().

This change here fixes that AndroidToolChain:::isValid incorrectly
returned true.

Change-Id: I28b321fe3c4064f61b78dc7fc36b8af3d18b806c
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-02-17 13:29:58 +00:00
Orgad Shaneh
1b2aa56f15 Git: Add grep and pickaxe filters
Fixes: QTCREATORBUG-22512
Change-Id: I98eed9a7f9da15e163804a0fd81713149a06c5b0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-02-17 13:11:52 +00:00
Robert Loehning
1ebb72b47f Squish: Update expected tooltips
Change-Id: I88c5757b1f3beda34773ec3738779094a8441c2f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-17 10:53:50 +00:00
hjk
9caf355e11 Nim: Move RunConfigurations to .cpp, drop Q_OBJECT
Also remove NimbleRunConfigurationFactory::availableCreators
reimplementation that was the same as the base.

Change-Id: Ied86c08e77a5bb70d8a16cdeddebd99c4ea5120c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-17 10:12:09 +00:00
hjk
7e363e4168 Qdb: De-Q_OBJECT-ify RunConfiguration
Change-Id: Ib632cb135915561682f68c0c37e0c3fefe92c0bb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-17 10:10:05 +00:00
Eike Ziller
df559b64df Merge remote-tracking branch 'origin/master' into 4.12
Change-Id: I091e191d1a9398cacd0ff0e063f89ffbe308189f
2020-02-17 10:28:08 +01:00
Eike Ziller
7738d77814 Merge remote-tracking branch 'origin/4.12'
Change-Id: Ibd37fd7aedbd0bcb1db56f92e6477abf9c9ab686
2020-02-17 10:17:31 +01:00
Filippo Cucchetto
1ccb2b36e2 Nim: Fix build broken target info on Windows
There's no need for adding .exe suffix. Further more project file path is
easier obtained through projectFilePath()

Change-Id: I3f512dfea1ca32b5f63dfcdd19cac112ef5e3c1e
Reviewed-by: hjk <hjk@qt.io>
2020-02-17 07:58:13 +00:00
Filippo Cucchetto
a640eb8560 Nim: workaround to project parsing loops
Nimble creates temporaries files when querying the task list
for the project files. For this reason we simply exclude
requesting a project reparse when the root directory changes

Change-Id: I6f1af3f073b056ecb2a7273fcb3df0cb44a1b53b
Reviewed-by: hjk <hjk@qt.io>
2020-02-17 07:58:06 +00:00
hjk
9510c7293f ModelEditor: Simplify setup of some plugin singletons
Change-Id: Ica4d10155160d06be52daf4b56b714d07ad92290
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: hjk <hjk@qt.io>
2020-02-17 07:01:43 +00:00
hjk
b9739c0945 Git: Hack around quoting problem with Short description on blame
Task-number: QTCREATORBUG-23208
Change-Id: Iaff99d7cd175d3d974ea295472cba2679da08372
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-17 07:01:13 +00:00
Andre Hartmann
4cbb24906f Git: Allow clicking references in VcsOutputWindow
Fixes: QTCREATORBUG-16477
Change-Id: If1f36bec0826a3116e5261a270cd63a1536e13f5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-16 19:13:53 +00:00
Andre Hartmann
d0a11322f4 Baremetal: Fix three compiler warnings
With gcc version 7.4.0 (Ubuntu 7.4.0-1ubuntu1~18.04.1)

plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp:173:13:
warning: ‘BareMetal::Internal::Uv::PackageItem::m_file’ will be initialized after [-Wreorder]
     QString m_file;
             ^~~~~~
plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp:172:13:
warning: ‘QString BareMetal::Internal::Uv::PackageItem::m_version’ [-Wreorder]
     QString m_version;
             ^~~~~~~~~
plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp:155:14:
warning: when initialized here [-Wreorder]
     explicit PackageItem(const QString &file)
              ^~~~~~~~~~~

plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp:500:19:
warning: suggest parentheses around assignment used as truth value [-Wparentheses]
     } while (item = item->parentPackItem());
              ~~~~~^~~~~~~~~~~~~~~~~~~~~~~~

plugins/debugger/uvsc/uvscclient.cpp:376:14: warning: variable
‘istkenum’ set but not used [-Wunused-but-set-variable]
     iSTKENUM istkenum = {};
              ^~~~~~~~

Change-Id: I95d0868e1b3ba9162bd9a308a7d39db9daf59742
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-16 18:59:19 +00:00
Andre Hartmann
b3cf553e1a Git: Ignore unknown push failures
Pushing to Gerrit can fail with due to missing
Change-Id. In that case, none of the existing
warnings should appear.

Change-Id: I4bf55d35a792b680e3ae524e116ce5db9fdd405a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Miklós Márton <martonmiklosqdev@gmail.com>
2020-02-16 16:18:35 +00:00
hjk
a7bd6864c1 Qbs: Avoid a FilePath<->QString roundtrip in QbsInstallStep
Change-Id: I8366fc694ba899bf74e0fea8e85aa99e709a57b4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-14 15:50:16 +00:00
hjk
1f5a089f24 Qbs: Pass related info directly to command line creation function
Saves a few casts and otherwise unneeded accessors.

Change-Id: I7a6ff1e8348a24690f35e69d300463a6c5c18867
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-14 15:48:38 +00:00
Thomas Hartmann
9af4b8694f QmlDesigner: Remove duration from TimelineForm
The timeline has an end and start. There was an invisble
spinbox for duration that I removed.

Change-Id: I5ab8c888db650f97dbb3dac08b5b202fa681d291
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-14 15:31:35 +00:00
Thomas Hartmann
0ffc029d70 QmlDesigner: Rename resources to assets in the ui
Task-number: QDS-1646
Change-Id: I8937f70adc3ad59f28d40f99852f2be053ce6c3b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-14 15:31:23 +00:00
Thomas Hartmann
f5389e57a9 QmlDesigner: Add animations to item library
Change-Id: I04272988e4d46ae9726a0dbdfc9433fd0b026607
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-14 15:31:08 +00:00
Thomas Hartmann
2f13a2a029 QmlDesigner: Add property editor sheets for animations
Task-number: QDS-1613
Change-Id: I38bd2274983ec063af625f924f61cfb262e24d1f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-14 15:30:55 +00:00
Thomas Hartmann
02e62602e7 QmlDesigner: Increase number of digits for timeline duration
Task-number: QDS-1635
Change-Id: Ie9c556faec578a5a5c01a6998074d929eec901b5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-14 15:09:56 +00:00
Thomas Hartmann
c8779e9c93 QmlDesigner: Create connections inside the target element
Change-Id: I29e00e4f90d1fec2f230a989c7b04f64e8b81a9b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-14 15:03:42 +00:00
Thomas Hartmann
95953f949a QmlDesigner: Only scatter item if they have positions
Task-number: QDS-1642
Change-Id: I0e99cfc9027e283d3dc6ce239a74c48bfc092e99
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-14 15:03:26 +00:00
Eike Ziller
673f50cae5 Merge remote-tracking branch 'origin/master' into 4.12
Change-Id: I2c0857b3845d9947d3e10ede5c67e2780a8815d6
2020-02-14 15:45:49 +01:00
Eike Ziller
e40014cb3a Merge remote-tracking branch 'origin/4.12'
Change-Id: Id983ca7f884e7a97ba0de19e1c24f6829f85d96e
2020-02-14 15:43:54 +01:00
Henning Gruendl
905db66355 QmlDesigner: Add new icon font
- Set unique family name to avoid clash
 - Add new icons

Task-number: QDS-1578
Change-Id: Ic526d2e015a6372d61241bcf1568cced119ab87a
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-14 12:54:49 +00:00