aboutsummaryrefslogtreecommitdiffstats
path: root/qtcreator.pro
Commit message (Collapse)AuthorAgeFilesLines
* Do not try to deploy QtQuick1 importsEike Ziller2020-11-061-1/+1
| | | | | | | | | 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>
* Project: Add files in cmake directory to qmake projectOrgad Shaneh2020-10-271-0/+1
| | | | | Change-Id: I96a1a32ebe4914a04fd3dc64a77f98cf3a2c5a2e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Require Qt 5.14 or laterEike Ziller2020-07-091-2/+2
| | | | | | | | | | 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>
* Packaging: Get rid of binary-artifacts repository usageEike Ziller2020-05-261-8/+2
| | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-05-041-2/+2
|\ | | | | | | Change-Id: Ib95ec2c50c4bbaefd4ed0ec5af191ccc846c824f
| * CMake build/Linux: Install desktop and appstream filesEike Ziller2020-04-301-2/+2
| | | | | | | | | | | | Fixes: QTCREATORBUG-23906 Change-Id: I9d796c8826dbb4beb980aa29b75526fe96093921 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Port QtCreator over to use filterRegularExpressionLars Knoll2020-04-011-2/+2
|/ | | | | | | | | | | | | | 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>
* Prepare for Notarization on macOSEike Ziller2020-01-131-1/+1
| | | | | | | | Applications need to be signed with "hardened runtime" for notarization to be possible Change-Id: I05eaef8ad32e2f3c56baea82969da8bc891a6afd Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* add brand QtCreator to something else featureTim Jenssen2019-05-021-1/+1
| | | | | | | | | | | | | | - 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>
* Merge remote-tracking branch 'origin/4.9'Eike Ziller2019-03-141-6/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * macOS: Package Qt Creator.app.dSYM with debug archiveEike Ziller2019-03-131-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Bump minimum Qt version (to build Qt Creator) to 5.11Alessandro Portale2019-02-151-2/+2
|/ | | | | | | | | 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>
* Make deployqt target recursiveEike Ziller2019-02-071-0/+3
| | | | | | | So perfparser's deploy target is triggered too Change-Id: I131a23b46127130967767fd7fee629ac5a97b17a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Add all qbs files to qmake projectUlf Hermann2018-06-201-1/+1
| | | | | Change-Id: I365ece28bdd389d9a8fd9d85243238b901ca29d2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Increase requirement for building Qt Creator from Qt 5.6.2 to Qt 5.9Eike Ziller2018-03-221-2/+2
| | | | | | | | | | | | | | 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>
* fix deploy Qt for renamed QtCreatorTim Jenssen2018-01-291-1/+1
| | | | | Change-Id: I7abd20ae8ad91ac5a7bf0d5daa856c0615ae3b10 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix more issues with renaming Qt Creator executableEike Ziller2018-01-231-3/+3
| | | | | Change-Id: I826469bdd90e482a77f4cd65fd4fa7e541103a12 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Filter debug info out when creating macOS disk imageEike Ziller2018-01-231-1/+1
| | | | | | | Move the script to Python for that, for code sharing Change-Id: I1a0b1ed7fe3ed4413045d478c82621d75800520e Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Do not run python scripts directly, but through python executableEike Ziller2018-01-171-3/+3
| | | | | | | There are some (Windows) setups that do not support this. Change-Id: I85ba6bf7eebe0d900b9befd3c42ba8de5b64973d Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Add make target for creating packages with debug infoEike Ziller2018-01-151-7/+8
| | | | | | | | | | | | | | | 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>
* Remove outdated installer creation script and resourcesEike Ziller2017-12-071-18/+1
| | | | | | | | | | 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>
* Bump minimum Qt version to 5.6.2Eike Ziller2017-08-291-2/+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>
* Update qbs submoduleJoerg Bornemann2017-04-041-7/+8
| | | | | | | 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>
* Quickfix for building Qbs documentationEike Ziller2017-03-101-0/+2
| | | | | Change-Id: Iad6690ffb1578040739ca0d5bb26ca701454ec7b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Build and install the qbs documentation (qmake build)Joerg Bornemann2017-01-241-0/+9
| | | | | | Task-number: QTCREATORBUG-13124 Change-Id: Iebc4d0f0b4dee13181c76dfae59bc1f79957f886 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Use shallow clone for binary artifactsOrgad Shaneh2016-12-191-1/+2
| | | | | | | The repo is deleted anyway right after the files are copied. Change-Id: Iec4ae3ca45e94c95a911f245bded36025d3f799b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Project: Clone binary artifacts via httpOrgad Shaneh2016-12-191-1/+3
| | | | | | | git port is sometimes blocked by firewalls. Change-Id: I8e53b119ec3401532a9da578b64d112250962f46 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* [Linux integration] Install desktop and appstream filesAleix Pol2016-12-141-0/+10
| | | | | | | | | | | | 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>
* Ship qtdiag in binary packagesEike Ziller2016-09-151-1/+1
| | | | | | Task-number: QTCREATORBUG-16135 Change-Id: I29aabb697feaf6546c807263b037d70abc0cc5eb Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Update requirements for building Qt CreatorEike Ziller2016-07-061-2/+2
| | | | | | | | 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>
* Add readme to distfilesEike Ziller2016-05-231-0/+1
| | | | | Change-Id: I8dba77fe0d746b044975ca00e372575fe232480b Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Bump required Qt version to 5.5hjk2016-03-211-2/+2
| | | | | | Change-Id: I4f152bde842c20b0dade863ffea118fe32322c5b Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Use variables for install locationsEike Ziller2015-09-221-6/+6
| | | | | | | | | | 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>
* Installers/OS X: Remove hack that is no longer necessaryEike Ziller2015-06-301-6/+1
| | | | | | | | 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>
* Merge remote-tracking branch 'origin/3.4'Eike Ziller2015-06-171-0/+7
|\ | | | | | | Change-Id: Id13cbdf2f7047366e543c91fbe7c21a9c4759e56
| * Adapt to qbs' libexec infrastructure.Christian Kandeler2015-06-031-0/+7
| | | | | | | | | | Change-Id: Ic2d609e017d201b7b3e0b3bcb08359652428aeaa Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Raise minimum Qt versionChristian Stenger2015-04-091-2/+2
|/ | | | | | | | | 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>
* Get rid of Gitorious linksEike Ziller2015-03-101-1/+1
| | | | | | | | 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>
* Temporarily (?) remove make dependencies on deployqt targetEike Ziller2014-10-281-3/+3
| | | | | | | | | 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>
* OS X: make code signing deep, which is needed since recent policy changesEike Ziller2014-10-201-1/+1
| | | | | Change-Id: Ib1de4ed310dc85328ecf18b9268631ffdb6dd5eb Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* use DISTFILES instead of OTHER_FILES in creator's own build systemOswald Buddenhagen2014-09-151-1/+1
| | | | | | | it's the correct variable to use. Change-Id: I9ec7795099097715a64969516cd3fae9e213a0f4 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec filesEike Ziller2014-09-021-1/+1
| | | | | | | | 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>
* Fix library and plugin pathsEike Ziller2014-09-021-4/+4
| | | | | | | | | 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>
* Remove pre-Qt 5.3.1 code paths from main Qt Creator pro and pri filesEike Ziller2014-08-261-3/+3
| | | | | Change-Id: I71bee691a2b9bad7dbdb4ca9c0a938d4313305f7 Reviewed-by: hjk <hjk121@nokiamail.com>
* Fix RPATH for qbs application.Christian Kandeler2014-08-081-1/+1
| | | | | | | | | 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>
* don't add qbs-related flags to CONFIG over and over againOswald Buddenhagen2014-08-081-2/+4
| | | | | Change-Id: I0ca49213d45ab7ab193266bbbc7f201cecdc6eac Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Update qbs submodule.Christian Kandeler2014-07-231-1/+1
| | | | | | | And do the necessary adaptations. Change-Id: I35b5c3e02a7265bdc9730154d6d1aa6b19371310 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Qbs: Use cache(...) instead of echoing system calls to write .qmake.cacheEike Ziller2014-07-111-27/+30
| | | | | | | | 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>
* Move call of qmake function relative_path() out of .qmake.cache.Christian Kandeler2014-06-271-6/+11
| | | | | | | Apparently, function calls are not allowed there. Change-Id: Iba5c093ec473eb89df4d046a218df6ec78d14c7c Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Fix default search and plugin path for qbs.Christian Kandeler2014-06-241-0/+2
| | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 12:46:01 +0000