Commit Graph

124 Commits

Author SHA1 Message Date
Eike Ziller
e101e83f84 Do not try to deploy QtQuick1 imports
We don't ship them with Qt Creator since a longer time now, and in Qt6
they are completely gone.

Change-Id: I7c6b1da1782cb641e17b2d1c7ff764dd81e15ee6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-06 06:57:10 +00:00
Orgad Shaneh
725f8a01e8 Project: Add files in cmake directory to qmake project
Change-Id: I96a1a32ebe4914a04fd3dc64a77f98cf3a2c5a2e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-27 14:52:36 +00:00
Eike Ziller
5a64a0c5be Require Qt 5.14 or later
This is required for proceeding with support for building
Qt Creator with Qt 6.

Change-Id: Ibf8a3eef6d6da943c5ee7f4a2239f45ee49b1093
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-07-09 08:34:46 +00:00
Eike Ziller
63df649655 Packaging: Get rid of binary-artifacts repository usage
We removed the cdbextension and wininterrupt binaries from there a long time
ago, and instead package these for the installer. Package newest jom version
from its actual release in the installer as well.

Task-number: QTCREATORBUG-23908
Change-Id: Ic9bdc97774cbeb894fc261e57af127d6cdc71205
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2020-05-26 06:35:45 +00:00
Eike Ziller
be73f41ad4 Merge remote-tracking branch 'origin/4.12'
Change-Id: Ib95ec2c50c4bbaefd4ed0ec5af191ccc846c824f
2020-05-04 10:52:34 +02:00
Eike Ziller
d7520dece5 CMake build/Linux: Install desktop and appstream files
Fixes: QTCREATORBUG-23906
Change-Id: I9d796c8826dbb4beb980aa29b75526fe96093921
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-04-30 07:06:20 +00:00
Lars Knoll
47e576528e Port QtCreator over to use filterRegularExpression
QSortFilterProxyModel::filterRegExp is going to go away in Qt6,
so port over to use QRegularExpression instead.

This required some changes where setFilterWildcard/FixedString()
was being used, as those would instantiate QRegExp based filters
in Qt 5, and will use QRegularExpression in Qt 6. Use the generic
setFilterRegularExpression here, to keep things portable between
5 and 6.

Change-Id: I6379be781aa3821b10ba783c088f82c1a0970911
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-01 20:36:49 +00:00
Eike Ziller
c2398e3067 Prepare for Notarization on macOS
Applications need to be signed with "hardened runtime" for notarization
to be possible

Change-Id: I05eaef8ad32e2f3c56baea82969da8bc891a6afd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-01-13 08:29:23 +00:00
Tim Jenssen
8000a3e70b add brand QtCreator to something else feature
- this patch enables branding QtCreator to something else
   excluding the logo icons which will follow in a later patch
 - qtcreator_ide_branding.pri is always included, so only
   need to write the values we want to override in a
   IDE_BRANDING_PRI file
 - if there is no BINARY_ARTIFACTS_BRANCH it won't checkout
   that repository

Task-number: QTCREATORBUG-22226
Change-Id: I592b40025cc53988224770b704622874f2174593
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-02 14:35:13 +00:00
Eike Ziller
c53ccceff1 Merge remote-tracking branch 'origin/4.9'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/debugger/debuggerkitinformation.cpp
	src/plugins/languageclient/languageclientmanager.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/kit.cpp
	src/plugins/projectexplorer/kitmanager.cpp

Change-Id: I66fb941202991f35f7d7761430b21e42dfc678a8
2019-03-14 15:51:15 +01:00
Eike Ziller
aa7568e027 macOS: Package Qt Creator.app.dSYM with debug archive
On macOS the debug info for the application is located parallel to the
app bundle itself, not somewhere inside the app bundle. I.e.
/some/path/Qt Creator.app
/some/path/Qt Creator.app.dSYM

So for the debug info we must use the parent of the app as a base
directory for packaging.

Change-Id: Ibb0e8721bb6a5ce272173a264074eece299d18da
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-03-13 09:06:46 +00:00
Alessandro Portale
88d1d92728 Bump minimum Qt version (to build Qt Creator) to 5.11
Recent adaptations to Qt 5.13's API deprecations require using APIs
which were introduces in Qt 5.11.

Change-Id: I6c077d824c9ce716e019543b290c355a5d512fad
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-02-15 14:39:12 +00:00
Eike Ziller
791d791f2c Make deployqt target recursive
So perfparser's deploy target is triggered too

Change-Id: I131a23b46127130967767fd7fee629ac5a97b17a
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-02-07 15:39:58 +00:00
Ulf Hermann
e30837fc1f Add all qbs files to qmake project
Change-Id: I365ece28bdd389d9a8fd9d85243238b901ca29d2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-06-20 12:19:21 +00:00
Eike Ziller
c23d2b6e09 Increase requirement for building Qt Creator from Qt 5.6.2 to Qt 5.9
Qt 5.11 will be released and Qt 5.9 is the new LTS.
Increasing the requirement allows us to remove some baggage and
workarounds like Utils::asConst, special Q_OVERRIDE header, and
deployment target adaptions on macOS, and simplifies pulling in
proparser changes from Qt.

Change-Id: I9faf99336d26dd20bd63e6904ae543c0f351aa4d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-22 10:01:36 +00:00
Tim Jenssen
700447d9a0 fix deploy Qt for renamed QtCreator
Change-Id: I7abd20ae8ad91ac5a7bf0d5daa856c0615ae3b10
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-29 14:20:24 +00:00
Eike Ziller
4947781bba Fix more issues with renaming Qt Creator executable
Change-Id: I826469bdd90e482a77f4cd65fd4fa7e541103a12
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-01-23 12:52:52 +00:00
Eike Ziller
b88bfe7db3 Filter debug info out when creating macOS disk image
Move the script to Python for that, for code sharing

Change-Id: I1a0b1ed7fe3ed4413045d478c82621d75800520e
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-01-23 12:21:49 +00:00
Eike Ziller
45f1547ffe Do not run python scripts directly, but through python executable
There are some (Windows) setups that do not support this.

Change-Id: I85ba6bf7eebe0d900b9befd3c42ba8de5b64973d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-01-17 12:46:24 +00:00
Eike Ziller
fd54a377fe Add make target for creating packages with debug info
Add a script that creates either a release binary package,
or a package with debug info, from a Qt Creator build with
CONFIG+=force_debug_info CONFIG+=separate_debug_info

Run "make bindist_installer" for the release package
and "make bindist_debug" for the package with only debug info.

First step for QTCREATORBUG-13002

Change-Id: I9d45db7f41f4af956221f6feb7c4e8ca7154892e
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-01-15 14:18:01 +00:00
Eike Ziller
36256d6e0c Remove outdated installer creation script and resources
It is no longer used (it is using same scripts as Qt now),
and contains outdated resources.

Change-Id: I0576d694ef16ced49303dfc4d6075b742dbcc3b1
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-12-07 13:45:06 +00:00
Eike Ziller
b6c1cb3487 Bump minimum Qt version to 5.6.2
Starting to use macos qmake scope. 5.6.3 should be around soon so
we can still regression test latest two patch levels.

Change-Id: I14f67a26e26c50f6dd0fb8b621f13780b0b05f76
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-29 11:23:15 +00:00
Joerg Bornemann
ead66987d4 Update qbs submodule
To HEAD of 1.8 branch, and adapt to changes of qbs's doc_targets.pri

Change-Id: I8027b02bd88691ce6460836d9cc67279f442058b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-04-04 13:57:14 +00:00
Eike Ziller
bc562bbea9 Quickfix for building Qbs documentation
Change-Id: Iad6690ffb1578040739ca0d5bb26ca701454ec7b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-03-10 10:35:50 +00:00
Joerg Bornemann
bc5dbd4d23 Build and install the qbs documentation (qmake build)
Task-number: QTCREATORBUG-13124
Change-Id: Iebc4d0f0b4dee13181c76dfae59bc1f79957f886
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-24 12:26:41 +00:00
Orgad Shaneh
c8c532a0e6 Use shallow clone for binary artifacts
The repo is deleted anyway right after the files are copied.

Change-Id: Iec4ae3ca45e94c95a911f245bded36025d3f799b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-19 09:14:11 +00:00
Orgad Shaneh
8728fb078e Project: Clone binary artifacts via http
git port is sometimes blocked by firewalls.

Change-Id: I8e53b119ec3401532a9da578b64d112250962f46
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-19 08:09:54 +00:00
Aleix Pol
0c20e582e4 [Linux integration] Install desktop and appstream files
Installs the appstream's appdata file into the correct location and with
the correct name. Fixes the contents to conform to the standard.
Installs a desktop file because it's both required by appstream and by
desktop environments. Note this was currently patched in by
distributions.

Task-number: QTCREATORBUG-17335
Change-Id: If1425ec9fbd0c639550852a8d6e1f15a6b9d77ef
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-14 13:31:43 +00:00
Eike Ziller
f4f447c078 Ship qtdiag in binary packages
Task-number: QTCREATORBUG-16135
Change-Id: I29aabb697feaf6546c807263b037d70abc0cc5eb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-15 09:24:36 +00:00
Eike Ziller
7812390b0b Update requirements for building Qt Creator
Change-Id: I462c496a6998862d1f1d09fc323342429115b67b
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Ralf Nolden <nolden@kde.org>
2016-07-06 08:11:51 +00:00
Eike Ziller
475e527cf0 Add readme to distfiles
Change-Id: I8dba77fe0d746b044975ca00e372575fe232480b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-05-23 14:35:13 +00:00
hjk
2baa1f8b77 Bump required Qt version to 5.5
Change-Id: I4f152bde842c20b0dade863ffea118fe32322c5b
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-21 13:44:13 +00:00
Eike Ziller
9dd84323df Use variables for install locations
Define variables in qtcreator.pri for the various
install locations, instead of hardcoding the paths
everywhere where they are needed.

Change-Id: Ia34de711a7f2be317272ede023e2a8b9cdcc30fe
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-09-22 12:16:08 +00:00
Eike Ziller
7743664957 Installers/OS X: Remove hack that is no longer necessary
There were a few Qt versions where the menu nib was missing from the
installer, but no longer.

Change-Id: I2ab95237cb5e0d2b72d7086f8a784a35e0c935a1
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-06-30 05:50:04 +00:00
Eike Ziller
4dd95aa5d4 Merge remote-tracking branch 'origin/3.4'
Change-Id: Id13cbdf2f7047366e543c91fbe7c21a9c4759e56
2015-06-17 12:04:21 +02:00
Christian Kandeler
8eb7c3efad Adapt to qbs' libexec infrastructure.
Change-Id: Ic2d609e017d201b7b3e0b3bcb08359652428aeaa
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-06-03 15:29:55 +00:00
Christian Stenger
9d86b7ed4e Raise minimum Qt version
Needed for supporting more C++11 features.

Change-Id: Ib3ab63b2698c86a1ad0153c3e4bead09cccdefca
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-04-09 07:01:57 +00:00
Eike Ziller
1eeca66c29 Get rid of Gitorious links
That service is discontinued, and we have our own mirror anyhow.

Change-Id: I8a45401e2c0c889d87c675a79ae16684d7c69a7a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-10 13:50:48 +00:00
Eike Ziller
29d20a9f85 Temporarily (?) remove make dependencies on deployqt target
Definitely avoid deploying Qt multiple times, since
this might be a reason for code signature verification on OS X bailing
out, claiming that files have been modified.

Change-Id: Ic45b6fd4af75a3b972aec8c0b4841f0ff4e7886d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-28 18:00:44 +01:00
Eike Ziller
12201a6304 OS X: make code signing deep, which is needed since recent policy changes
Change-Id: Ib1de4ed310dc85328ecf18b9268631ffdb6dd5eb
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-20 14:34:29 +02:00
Oswald Buddenhagen
ca492c8fac use DISTFILES instead of OTHER_FILES in creator's own build system
it's the correct variable to use.

Change-Id: I9ec7795099097715a64969516cd3fae9e213a0f4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-15 12:10:01 +02:00
Eike Ziller
b5b6a46b4e ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec files
Change-Id: I2b2c704260c613985a4bda179658ec1f8879e70f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-02 15:11:24 +02:00
Eike Ziller
deea0022f7 Fix library and plugin paths
OSX: Move libraries from PlugIns/ to Frameworks/
other: move QmlDesigner plugins to plugins directory

Change-Id: Ia266a3514ce6a496061daa044b3781daae0bc272
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-02 09:24:10 +02:00
Eike Ziller
78b642eb0c Remove pre-Qt 5.3.1 code paths from main Qt Creator pro and pri files
Change-Id: I71bee691a2b9bad7dbdb4ca9c0a938d4313305f7
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-08-26 11:00:57 +02:00
Christian Kandeler
433426847f Fix RPATH for qbs application.
The current random number of backslashes results in an RPATH of
'\RIGIN' in the binary. Use a different random number of backslashes
instead.

Change-Id: Ife0f1a9c7f65d9e83dc39e90cb150421755ebb2c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-08-08 14:40:19 +02:00
Oswald Buddenhagen
3e08d94436 don't add qbs-related flags to CONFIG over and over again
Change-Id: I0ca49213d45ab7ab193266bbbc7f201cecdc6eac
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-08-08 13:17:40 +02:00
Christian Kandeler
5a16eaca04 Update qbs submodule.
And do the necessary adaptations.

Change-Id: I35b5c3e02a7265bdc9730154d6d1aa6b19371310
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-23 11:33:54 +02:00
Eike Ziller
e7b07a2b36 Qbs: Use cache(...) instead of echoing system calls to write .qmake.cache
Qbs is nowadays disabled with Qt4 anyhow, so we can use the less
hacky Qt 5 methods

Change-Id: I9ce9391238b3597cc4b31e9f9f6647cec1a2496e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-07-11 11:07:05 +02:00
Christian Kandeler
a02dc5135e Move call of qmake function relative_path() out of .qmake.cache.
Apparently, function calls are not allowed there.

Change-Id: Iba5c093ec473eb89df4d046a218df6ec78d14c7c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-06-27 12:00:28 +02:00
Christian Kandeler
9b9814fd72 Fix default search and plugin path for qbs.
That is, the qbs command-line frontend that we build.

Task-number: QTCREATORBUG-12474
Change-Id: Ia21c24daa25fff5ffe2fe69d23bd6d30285eec9a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-24 16:39:24 +02:00