Commit Graph

67787 Commits

Author SHA1 Message Date
Cristian Adam
873a543c6f CMake Build: Do not set suffix for qtcreatorcdbext dll
Change-Id: Id0b5692df1661fe1e20b77d1e538c01fbb974b5e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-19 10:34:08 +00:00
Andre Hartmann
fc54911441 QmlDesigner: Fix signed/unsigned comparison warning
plugins/qmldesigner/components/curveeditor/detail/graphicsscene.cpp:129:33:
warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
             if (curveItem->id() == id)
                 ~~~~~~~~~~~~~~~~^~~~~

Change-Id: I0a89701755c47b37e5ea0a0d6717d78e10bb619d
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-19 10:05:36 +00:00
Andre Hartmann
e5a3084e97 QmlDesigner: Fix unused-but-set-variable warning
plugins/qmldesigner/components/formeditor/formeditoritem.cpp:649:19:
warning: variable ‘pos’ set but not used [-Wunused-but-set-variable]
     const QPointF pos = qmlItemNode().flowPosition();
                   ^~~

Change-Id: Ia5c59bd47ab6b5dd6324280214f60ca5dabdc9f6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-19 10:03:46 +00:00
Andre Hartmann
e5dd68990f QmlDesigner: Fix unused parameter warnings
Change-Id: I79e815bf366b002b951198d47e1197738a77593a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-19 10:02:30 +00:00
Thomas Hartmann
5be19869aa QmlDesigner: Use NodeHints for reparenting in container
Change-Id: Id7ee463a5d526979ee6cc802d28deb7d79b94a07
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-19 09:58:56 +00:00
hjk
5064bddff6 Work around QLocalSocket::error deprecation
Centralizing does not bring much benefit here, it's just six locations,
and having either a central #include <QLocalSocket> in algorithm.h
or a separe file does not sound better.

In any case, it is absurd, that deprecating functions to "make code
nicer" requires spilling #if QT_VERSION_CHECK over the code.

Change-Id: Ia9a8c0eb6ef7cabbaffb46cfe472247e26e7e2c2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-19 09:57:04 +00:00
Thomas Hartmann
0ed1d1c374 QmlDesigner: Use canBeContainer for animations
Change-Id: I18bd1038426334f51f42d2423c1cdb35c8b5f2c1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-19 09:56:59 +00:00
Eike Ziller
8a18ccdef9 Add script for building Qt Creator for packaging
The result is a number of 7zips in the build directory
that can be packaged in an installer, or unzipped
on a different machine directly

Change-Id: Ic1a691678b2268c08e9159c1958dbecefc640fc3
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-02-19 09:56:08 +00:00
hjk
a68aee95a1 ProjectExplorer: Replace ProjectConfiguration::m_macroExpander
... by MacroExpanders in Build and RunConfiguration. Deploy didn't
use its own, BuildStep always composed an empty expander with
the BuildConfiguration's, uses now the BuildConfiguration's expander
directly.

Change-Id: I9de51bfc32aeb3d73f4974175e42a37807e49ac1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-19 09:31:02 +00:00
hjk
e63a6744ba ProjectExplorer: Make some noise in BuildStep::buildSystem
... when it is potentially diverting to a wrong build configuration.

Change-Id: Ib2b11268cf64e9a969e7636cb2d70f1843f5c7a4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-19 09:19:19 +00:00
Christian Kandeler
faf7e8f49a QbsProjectManager: Do not store expanded qbs executable path
... unless it was explicitly set by the user.
Otherwise, e.g. the derived Creator-internal path will end up verbatim
in the settings, and this value will be wrong when switching the build
dir etc.

Change-Id: I89818e683f403e28855934e42b56f59892f260cc
Reviewed-by: hjk <hjk@qt.io>
2020-02-19 09:00:21 +00:00
Eike Ziller
fee9bf9cb8 Fix documentation for ExtensionSystem::invoke
For new qdoc

Change-Id: Icc4e78bebcf102d58b6b06c8c6b72b738a98db28
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-19 08:59:53 +00:00
hjk
89e2327f23 ExtensionSystem: Replace a deprecated endl
Change-Id: Ib6b297b0176518d3bc2db1e45476cc9e8c00b2e0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-19 08:34:31 +00:00
hjk
006da25949 Boot2Qt: Adapt to QProcess::startDetached() deprecation
Change-Id: I2793c4298ddc30831454de8664a8ccd8e8678bd5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-19 07:43:44 +00:00
Orgad Shaneh
ee05e49f79 Git: Support entry list in reflog
Change-Id: Ic24eff465c6870f42c1964a8700cc6f0b2c0dce5
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-02-19 07:23:42 +00:00
Orgad Shaneh
857102748d Git: Refine editor names
Change-Id: I8302e1341e589b3c0e39c3d6c1d73b01e142e517
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-02-19 07:23:26 +00:00
Orgad Shaneh
c728d04b52 Git: Support reflog also for branches
Change-Id: I9321ba4964d086d90aaf540a2006f95b94de8375
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-02-19 07:23:11 +00:00
Orgad Shaneh
c9f1d84db7 Git: Add config widget to reflog
Change-Id: I04a9bd86c38ab27537c2d6981179a667bc36e61b
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-02-19 07:22:57 +00:00
Eike Ziller
e886c13abc Make documentation part of branding
So Design Studio can build different documentation than Qt Creator

Change-Id: I078df39d36533a1659caac937ef869e4bf0c7a43
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-19 06:57:53 +00:00
Eike Ziller
15eccee798 Merge remote-tracking branch 'origin/4.12'
Change-Id: I25baa2e1dc0a06fac6e16471ca70ba2000588797
2020-02-19 07:40:32 +01:00
Eike Ziller
edc3eccd12 Merge remote-tracking branch 'origin/master' into 4.12
Change-Id: I20de58817658e2c715ce550761976ae67b3bef4d
2020-02-19 07:37:41 +01:00
Andre Hartmann
937e2b56e7 VcsOutputFormatter: Fix multiple regexp matches
Fixes: QTCREATORBUG-23614
Change-Id: I86e548a1f727113782afbc6b934d6dddc92c92ea
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-02-18 19:19:26 +00:00
Andy Shaw
e22eea1cf3 Fix the Python templates
This fixes the templates so that they do not produce any warnings
and also includes QQuickItem in the choice of base classes

Change-Id: I58bbd462052f5d2a64bb8c4bea5bbdcd15e66700
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
2020-02-18 16:13:20 +00:00
Christian Kandeler
5bb6c7f0cf ProjectExplorer: Call RunConfiguration::update() when restoring
Otherwise, the executable path will not be set right after cloning a run
configuration. This is due to the fact that it's not a stored attribute,
but is retrieved from the build system.

Change-Id: I948a2765b5b5d7707b44a72fcde7559e2742284c
Reviewed-by: hjk <hjk@qt.io>
2020-02-18 15:04:41 +00:00
Robert Loehning
0b6386d1f8 Squish: Update QtOptionsPageWidget
Fixes error in tst_default_settings

Change-Id: I927edb0cab7c73a4830272cf6fb2f655cee4cd8d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-18 14:43:52 +00:00
Robert Loehning
3e9437d8c5 Squish: Update chooseTargets()
Fixes tst_cmake_speedcrunch

Change-Id: I154647ca2108676b4184170ef121649547c3fd41
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-18 14:42:34 +00:00
Denis Shienkov
6e1032f235 BareMetal: Allow to choose 'tools.ini' for UVSC provider configuration
An each Keil installation contains an own 'tools.ini' file.
The "tools.ini" file is used to determine the paths to the installed
debugger drivers as well as to the device software packs. These drivers
and packs are displayed on a UVSC provide configuration widget and are
used for debugging.

Previously, a path to 'tools.ini' file was detected automatically
from the configured Kit of the opened project, using the
SessionManager::startupTarget() method (a Kit contains the debugger
path, which is the uVision executable).

But, in that case the user can't configure the UVSC provider if a
project is not opened yet.

This issue is solved by adding a path chooser to the UVSC provider
configuration widget. That allows to user to choose the desired
'tools.ini' file instance in any time.

Change-Id: Ife44d69704c9dd2102baecb0ff1954fa4bc05f1e
Reviewed-by: hjk <hjk@qt.io>
2020-02-18 14:42:02 +00:00
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