Commit Graph

281 Commits

Author SHA1 Message Date
Tim Jenssen
d011e7df25 add some qmlpuppet cpp files to dev package
Since external plugins are interacting with the puppet
we need them in the dev package.

Change-Id: I871629ad80583a09b842bb60cd5b6fab5b512fae
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-20 17:08:28 +00:00
Tim Jenssen
4fe5b923cd Merge remote-tracking branch 'origin/qds-1.59' into 4.13
Change-Id: Ic720f3adab305c5ef8cd10e713ccabf510eff0c0
2020-08-13 06:39:40 +00:00
Eike Ziller
715aa04d33 Fix clazy-standalone deployment on Linux
For some reason the RHEL build of LLVM has ClazyPlugin in 'lib64'
instead of just 'lib'.

Fixes: QTCREATORBUG-24344
Change-Id: Ibfca2aabd4c25ad4d80ea0e56de5ca8692b3c7ae
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-08-10 13:03:27 +00:00
Eike Ziller
ded5c64d53 Fix deployment of clazy-standalone
On Linux and macOS, clazy-standalone links against some dynamic
libraries which we need to ship.

Fixes: QTCREATORBUG-24344
Change-Id: I4946d2ae22fc9363445e6a3eecb8d9e40be5ef0e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-17 06:23:03 +00:00
Tim Jenssen
42d0c2b9f4 add litehtml to dev package
Change-Id: If33500eda8d095d1d9d63afe4ad8331109a22871
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-10 07:15:02 +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
Eike Ziller
7c329e1902 Merge remote-tracking branch 'origin/4.12'
Change-Id: I4935b6afdb13627f32e850a4c8b536de0269bc4b
2020-06-25 09:28:57 +02:00
Friedemann Kleint
848054ce3c Add shiboken2tasks.py for converting Qt for Python's shiboken tool warnings
Add a tool for converting shiboken  warnings to task files to be
able to load them into the Issues pane of Qt Creator.

Task-number: PYSIDE-904
Change-Id: Ie28e93ad76a615e549594edf5bba60e134b46a88
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-06-24 09:03:00 +00:00
Eike Ziller
2e130acfd7 CMake build: Show build date in about dialog in packages
The default for non-packaging build is OFF.

Fixes: QTCREATORBUG-24128
Change-Id: Id422babe197e215d6cb33807a78ba1ee3aaabb32
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-06-15 11:32:22 +00:00
Eike Ziller
0f362115c1 CMake build: Deploy elfutils
Fixes: QTCREATORBUG-24131
Change-Id: Ibfe829492e86ce1563882cf3be6469f9e553812d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-05 17:34:51 +00:00
Eike Ziller
e2e50f80fa Deploy: Use argparse instead of gnuopt
It's the more modern variant that we use everywhere else.
Add -i/--ignore-errors as a dummy option since it wasn't used for much,
and all callers used it anyhow - always ignore the one error that it
applied to.

Change-Id: Iecb5b434b6c21fc555410565a8e63a80844228cc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-05 17:34:40 +00:00
Eike Ziller
b3ffd8d1eb CMake build: Move documentation functions to re-usable location
Removes "install_..._docs" and "clean_docs" special targets.
Instead install documentation with "--install . --component qch_docs"
and "--install . --component html_docs" which have the advantage that
the install prefix can be specified later on with --prefix.
Also removes export of IDE_SOURCE_DIR, which is not used.

Change-Id: I4fce0b9aa8c7fc40b7e94e065777ddf4c0b76c41
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-05-25 11:31:06 +00:00
Eike Ziller
7051ba8498 Build script: Add option for passing arguments to build command
So one can pass e.g. -j3 when locally testing while still doing other things

Change-Id: I7a528884f19698290e49c372eb31030afe609d23
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-05-15 12:50:24 +00:00
Eike Ziller
f574f478eb build_plugin.py: Add option to pass additional arguments to CMake
Change-Id: Ifab717fdca9b8c5d4585146e552a60fc66c08d74
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-05-05 08:03:41 +00:00
Eike Ziller
5feec21cbd Packaging: Install documentation
Fixes: QTCREATORBUG-23912
Change-Id: I2e28c9f9000dca1216ec31bad307031937223e83
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-04-29 14:25:58 +00:00
Eike Ziller
05f746cfd0 Add script for building external plugins for packaging
Also turn off PCH for building Qt Creator and add some more options for
local testing.

Change-Id: Ic05099ef1dd8e8c78b174d7cd07a83b2f4a9cbb5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-28 11:21:19 +00:00
Tim Jenssen
081186811d qds: remove workaround when qdocconf was somewhere else
After moving the QtDesignStudio documentation to the QtCreator
repository there is no need for these extra files in the dev
packages.

Change-Id: I4e24946bb6752403a6ecafb0c474332ad2317b1a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-04-24 08:34:16 +00:00
Eike Ziller
9eceb46739 Fix link on commit sha in about dialog
Passing a URL via defines breaks when trying to "stringify" it.
It would always stop at the first slash.
Instead use a qmake variable directly. That has the additional advantage that
the value isn't passed on each and every compiler command line.

Change-Id: I97a297fbcdee5ea03eb6fa08181c95b1ad2de767
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-03-23 07:14:27 +00:00
Alessandro Portale
3a52269a1d scripts: build.py: Handle Null path in default_python3()
Change-Id: Ice6b269502a77f31a7af447429bba4332df026e9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-26 12:00:48 +00:00
Eike Ziller
fa59e02f89 Merge remote-tracking branch 'origin/4.11' into 4.12
Change-Id: I8cc80483cdb10309bf73aba5cfab52c1d90e1bbc
2020-02-26 08:14:47 +01:00
Eike Ziller
a8cca1b89a build.py: Remove unused 'temp' directory
Change-Id: I7b6a45aa2ac1d0851207512e2659f46f1940f628
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-26 07:01:23 +00:00
Eike Ziller
c34864ccab macOS: Disable library validation when signing
So we can load 3rdparty plugins even when the app is signed and notarized.
Also give Qt Creator "debugging" capabilities, allowing it to attach
to processes.

Change-Id: Ia6bb8ab279920b75a96777eafebbb4e7454fda46
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-19 12:53:02 +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
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
42f02fae03 Merge remote-tracking branch 'origin/4.11'
Change-Id: Ie1c4de44aa1af20dfb67e20607b9fb4e71445cbe
2020-02-12 08:04:14 +01:00
Eike Ziller
c522ceb7dd macOS: Do really deep deep code signing for notarization
Notarization is more picky than the regular code signing.
All code outside of the "usual" binary directories must be signed
separately, in addition to being codesigned with the application
afterwards.
That includes Imports/qtquick2 and Resources/libexec.
We cannot just move these into e.g. MacOS/ or PlugIns/ either, because
these directories may _only_ contain code, no other resources.

Change-Id: Id05b2644e01b61e9c33d86617c6374225b50e7f3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-10 13:04:39 +00:00
Eike Ziller
0795a5ae6f Merge remote-tracking branch 'origin/4.11'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I4e339410b17df4098f17e3bb621e1c02e3f8026b
2020-02-07 10:41:09 +01:00
Eike Ziller
ee579b5bf3 macOS: Use hardened runtime when signing
Follow up of c2398e3067

Change-Id: I003f03097633202585d36a136136d84d8f3c2140
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-07 07:44:18 +00:00
Eike Ziller
e16876df0c Merge remote-tracking branch 'origin/4.11'
Change-Id: Ieb0bb1ebab9a5efb42d15bbeac2cd4c46a6de962
2019-12-18 09:14:14 +01:00
Tim Jenssen
ba7545f2ff fix missing comma in source include patterns
Task-number: QDS-1403
Change-Id: I907462f0978c1610ba2e7af10f386380f8ea18c7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2019-12-17 13:33:35 +00:00
Tim Jenssen
be9cad77d2 Add another QDS doc image file path
Task-number: QDS-1403
Change-Id: I104480405033838a565f5a596ab43404db5f40dc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-12-17 09:39:07 +00:00
Nikolai Kosjar
0d7a30cdfe ClangTools: Query the tools for supported checks
...instead of hardcoding them for a particular version of
clang-tidy/clazy.

While at it, move also the tidy/clazy widgets to ClangTools as this
simplifies feeding data to them.

Reduce also the built-in configs to a single one using clang-tidy's and
clazy's default checks as they look very reasonable and saves us some
porting effort. Also, our previous built-in configs were just too
numerous.

Change-Id: Ib9297acb7810a940b86a23a8695530506a570394
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2019-12-03 13:23:13 +00:00
Eike Ziller
e41f71caac macOS deploy: Remove debug folders from deployed Qt and deploy qbs on demand
Change-Id: I2cd60da041c580e6599d867f1a95c2f868f4a800
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-05 12:34:35 +00:00
Eike Ziller
4843216192 macOS: Fix execution of helper executables with UI
The qt.conf that is written into the Resources/ folder
is used for the main Qt Creator executable, so that cannot
be used for the helper executables.

Move the executables one more level down and add a separate qt.conf
for them.

Fixes: QTCREATORBUG-23120
Change-Id: Icd8842d246a1bc0e8d44656e2bc580d6698afbda
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-05 12:31:40 +00:00
Christian Stenger
7cec3cfc94 Scripts: Fix helper script on macOS
Broke with ca15e1ed0c.

Change-Id: Ife884234ff8716b3019f2d302598c887d1498a92
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-10-29 05:55:39 +00:00
Tim Jenssen
ca15e1ed0c QmlDesigner: add 3d assetimporter plugins
macdeployqt was not enough because this is a runtime dependency

Change-Id: Idde6db46a4761288aec364cc83969a533e69816b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-28 12:48:56 +00:00
Tim Jenssen
d53d874224 add assetimporters as a new QtQuickDesigner depdency
This is used to import QtQuick3d content as resources in the designer.

Not sure if we need the qtmodule QtQuick3d in QtCreator if QtCreator also
want to offer that functionality

Change-Id: I7b50b820916dbe0bc0a0fc6dedc29fcb08d54f3b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-24 15:28:44 +00:00
Nikolai Kosjar
2a8a39f12b Deploy clazy-standalone for the ClangTools plugin
Change-Id: If554d3ade48da8d3877770d7e42af7185b30ceb6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-08 07:52:17 +00:00
Nikolai Kosjar
835477b52f Deploy clang-tidy binary for the ClangTools plugin
Change-Id: I4491c985cdcb93ca94be491d1acb9d960f96a190
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-27 06:42:38 +00:00
Nikolai Kosjar
6d7a626910 Deploy clangd binary also on macOS
Amends c1a0d89732.

Change-Id: I81c23522d2332c9db442ceadf94559407fd3594f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-02 07:29:50 +00:00
Tim Jenssen
cc2b8923dc update image paths in dev package script
Change-Id: I169709e0f7746fdd9b44cf095c2c5249f03658f4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-07-09 12:36:34 +00:00
Nikolai Kosjar
69d8b7f739 Clang: Fix tidy checks
generateClangTidyChecks.py generated funny output as it was not
considering new major categories.

Fixes: QTCREATORBUG-22450
Change-Id: Ibd6d0cc7539c9fb846caacbe936770d0c960f04f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-09 06:54:23 +00:00
Eike Ziller
e23ebfbd20 Merge remote-tracking branch 'origin/4.9' into 4.10
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: Id73301c82c4ba50e0a886e850da2c92bbeed4dc3
2019-06-03 10:46:09 +02:00
Tim Jenssen
38f8a7a6b1 add QTDS doc used image folders to dev packages
Change-Id: I06b38d9b66833ee161728e7dfad2e11a5afd4f81
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-28 12:36:54 +00:00
Eike Ziller
4545c81e57 Merge remote-tracking branch 'origin/4.9'
Conflicts:
	doc/src/howto/creator-sidebar-views.qdoc
	doc/src/howto/creator-ui.qdoc
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/autotest/testresultmodel.cpp
	src/plugins/autotest/testresultmodel.h

Change-Id: I24cc585ca7782cb1d9cb0b8b73b46892b41937fd
2019-05-08 12:41:25 +02:00
Eike Ziller
70df1f1c5d Add perfparser to source package
Change-Id: If984f7fbea15d9d6c9efb4b80a219afeae6e1baa
Fixes: QTCREATORBUG-22348
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-04-29 12:18:16 +00:00
Ivan Donchevskii
2d8ce380c9 ClangFormat: Fix UI issues
- 'Default' values remain so after save/load
 - the language is fixed to C++
 - the project settings are shown correctly
 - fix parsing configuration file
 - do not trigger slots when we fill the table

Change-Id: I91b477721b5084803324cd38d0cfeb9d5650dd9f
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2019-04-26 07:55:00 +00:00
Ivan Donchevskii
fb52d9e419 ClangFormat: Make UI not translatable
Change-Id: I69f8763f6337e8372e7bd24d82ea4b5f3f9fb7fe
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2019-04-25 10:55:00 +00:00
Ivan Donchevskii
e9d443b1c7 ClangFormat: Improve the configuration UI
Use QComboBox, QLineEdit and QPlainTextEdit to edit
different option types.

Show changes in the preview without pressing 'Apply' button.

The clangformatchecks.ui file is generated with the python
script that is a part of this commit.

Change-Id: If5ff0acab6edd74f2e087e31fbd3ad1b9f847030
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2019-04-25 07:52:48 +00:00