summaryrefslogtreecommitdiff
path: root/qtcreator.pri
Commit message (Collapse)AuthorAgeFilesLines
* Remove unneeded .pro/.pri filesEike Ziller2022-12-201-291/+0
| | | | | | | | | | Remove qtcreator(_ide_branding).pri, and all remaining .pro/.pri files that depend on it. They have CMake files now. Change-Id: I87d100b49df7ca95694a755cb581cb5eea26aa9a Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CMake build: put .lib files next to .dll files for librariesEike Ziller2021-05-201-0/+2
| | | | | | | | | | | | | - there is no reason for putting them elsewhere - since CMake file-api only reports the .lib location for linked libraries, Qt Creator has difficulties with adding the correct PATH for running e.g. manual tests, when the .lib files are at an arbitrary location Fixes: QTCREATORBUG-25684 Change-Id: I24b26a79c70fd5384f534f8f0b66b51fca1ecc56 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* ClangCodeModel: Fix debug build with qmakeChristian Stenger2021-05-191-11/+2
| | | | | Change-Id: Ia204ad0aeaeba2afb753e5bc54cf02285a9100e5 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Project: Add CMakeLists.txt to qmake projectOrgad Shaneh2020-10-271-0/+1
| | | | | Change-Id: Ifc8246bb801c7e9350c0aabe8debd847063192ac Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* qmake build: Add alias for C++17 that is available in older Qt versionsEike Ziller2020-08-181-1/+3
| | | | | | | | We use Qt 5.9 to build a separate sdktool, for platform compatibility, but that doesn't have 'c++17' yet. Change-Id: Id6602e95d418d7d93b19e2b1ad60f13e1acf7280 Reviewed-by: hjk <hjk@qt.io>
* Replace QT_USE_FAST_{OPERATOR_PLUS,CONCATENTION} by QT_USE_QSTRINGBUILDERhjk2020-08-071-2/+1
| | | | | | | | | | QT_USE_FAST_CONCATENATION doesn't do anything nowadays. Using QT_USE_QSTRINGBUILDER is the same as QT_USE_FAST_OPERATOR_PLUS for QStrings and enables more QStringBuilder use for QByteArrays. Change-Id: Ibd297817c50d86661d47822799f989447249af1b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Qmake build: Add core5compat globally for Qt6 buildshjk2020-07-131-0/+1
| | | | | | | | | We use QTextCodec all over the place, so a finer-grained solution doesn't buy us much. Task-number: QTCREATORBUG-24098 Change-Id: I31c73781fe04db597f7d690bf72829f268333e24 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Require GCC 7 and enable C++17Eike Ziller2020-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | Fix MSVC2019 - result type of conditional expression is ambiguous: types 'const char [1]' and 'QByteArray' can be converted to multiple common types Fix MinGW 8.1 - undefined reference to SemanticHighlightNotification::methodName Fix Utils::transform with std::vector for GCC & MSVC Unfortunately we cannot get rid of the special variant and optional implementations, because Apple Clang requires deployment target >= 10.14 for the functions that can throw std::bad_optional_access. Fixes: QTCREATORBUG-20520 Change-Id: I5c36a70f21f8b0215d2f4fc5c0653a022778d928 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* macOS: Fix execution of helper executables with UIEike Ziller2019-11-051-2/+2
| | | | | | | | | | | | | | 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>
* Enforce QT_NO_JAVA_STYLE_ITERATORShjk2019-06-201-0/+1
| | | | | | | We don't use them and Qt is likely to deprecate them. Change-Id: Ib2fbb3f509081f5eb7aae6c41dd330cc57db59e1 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* add brand QtCreator to something else featureTim Jenssen2019-05-021-11/+4
| | | | | | | | | | | | | | - 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-02-081-1/+1
|\ | | | | | | | | | | | | Conflicts: qtcreator.pri Change-Id: I278bc79cb64705471b360d0b8d06a8db17db7904
| * Merge remote-tracking branch 'origin/4.8' into 4.9Eike Ziller2019-02-081-1/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri Change-Id: I84dc8b9c7a029f2f40c4fa3ef78eef338247a6c0
| | * Bump copyright yearEike Ziller2019-02-071-1/+1
| | | | | | | | | | | | | | | Change-Id: I532c92311fda448fc272ab31e26ad562d9fb3ce5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * Bump version to 4.8.2Eike Ziller2019-01-171-2/+2
| | | | | | | | | | | | | | | Change-Id: I99f7baaab46a157f37e72619b71e968b37c330f4 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| | * Bump version to 4.8.1Eike Ziller2018-12-101-2/+2
| | | | | | | | | | | | | | | Change-Id: Ic5447ccb1e0a5e9b181d4210b2c84b526681c6da Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | Bump versionEike Ziller2019-02-071-3/+3
|/ / | | | | | | | | Change-Id: I90fac436cdab41739633c383445003a3c8f9feae Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | TextEditor: replace generic highlighter with ksyntaxhighlightingDavid Schulz2019-01-281-0/+1
| | | | | | | | | | | | Fixes: QTCREATORBUG-21029 Change-Id: I9894c4384e0e47da6bf030b7b8e07c3ad4737ff3 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Version for master is 4.9.0-beta1Eike Ziller2018-11-291-4/+4
|/ | | | | Change-Id: I2c3ca4910147445c4493828df5c6252f30379dc9 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 4.8.0Eike Ziller2018-11-261-3/+3
| | | | | Change-Id: I593dc1905bd4e2240449fb9f393c2c14b73488f1 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Version bump to 4.8 RC1Eike Ziller2018-11-191-4/+4
| | | | | Change-Id: I67dbd98002f270bc053f3680adcf51034cde4593 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Increase QT_DISABLE_DEPRECATED_BEFORE to 5.9Orgad Shaneh2018-11-121-1/+1
| | | | | Change-Id: I16b1fe72a9f9b87a8e7676a1591a5254d4005fad Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 4.8 beta2Eike Ziller2018-10-121-3/+3
| | | | | Change-Id: Ie8034adcc95a188d5a78a71b303fc073ea1d6a3c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Version bump for 4.8 betaEike Ziller2018-05-161-4/+4
| | | | | Change-Id: Ib61d6d6d6f2433299fe7867576a7c7d8558011ac Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.6' into 4.7Eike Ziller2018-05-141-1/+17
|\ | | | | | | | | | | | | | | | | Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp Change-Id: I873a2fa112321225e7b478739fc017b01d24ce18
| * Support out of source support librariesEike Ziller2018-05-091-1/+17
| | | | | | | | | | | | | | | | | | | | It was not possible to use QTC_LIB_DEPENDS if the library is not in the Qt Creator source tree. Provide a QTC_LIB_DIRS variable, similar to QTC_PLUGIN_DIRS. Task-number: QTCREATORBUG-20382 Change-Id: I9120d221b6567f699881c0ad00d1f1e49ef3b920 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Version bump to 4.6.2Eike Ziller2018-05-041-2/+2
| | | | | | | | | | Change-Id: I34702cbff029caa071f4e3556350011d84d26f2a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Version bump to 4.6.1Eike Ziller2018-03-281-2/+2
| | | | | | | | | | Change-Id: I814d2b864dff341977a41c4d03d96de465a72775 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-03-191-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri Change-Id: Ifd9524b0155067faf9d8a90858cc5f7da6b651bf
| * Version bump to 4.6.0Eike Ziller2018-03-161-4/+4
| | | | | | | | | | Change-Id: Ibf3dd86a654080cb9b5ab2a4fd790f8f59879787 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Version bump to 4.6-rc1Eike Ziller2018-02-071-3/+3
| | | | | | | | | | Change-Id: I87c6a2452ad5ef86eb3146373a11124f3a199b32 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-01-231-1/+1
|\ \ | |/ | | | | Change-Id: I49e8b8442e2b5edffbea19cb2bba97443ebc3d2a
| * Fix more issues with renaming Qt Creator executableEike Ziller2018-01-231-1/+1
| | | | | | | | | | Change-Id: I826469bdd90e482a77f4cd65fd4fa7e541103a12 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-01-191-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: qtcreator.pri Change-Id: I7dcd8e067b7597144eb3b27d917cb7fe0279aad4
| * Merge remote-tracking branch 'origin/4.5' into 4.6Eike Ziller2018-01-171-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri Change-Id: I52986bd2557490431bae48f9db86c848a95592d2
| | * Bump displayed copyright yearEike Ziller2018-01-171-1/+1
| | | | | | | | | | | | | | | Change-Id: I5cb95e9b4736279b547208f303a5453f5a4f9dc5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * Version bump to 4.5.1Eike Ziller2017-12-121-2/+2
| | | | | | | | | | | | | | | Change-Id: Ifb5656f33cdb4370c1c654c8d98587071528a72f Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| | * Bump versionEike Ziller2017-11-241-3/+3
| | | | | | | | | | | | | | | Change-Id: Ie823825b9dd4092f9997716790bfc3fbe138dd46 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | Bump versionEike Ziller2018-01-171-3/+3
|/ / | | | | | | | | Change-Id: I7ab954a3d696203a392e618933e8f075466af61a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Make executable name configurableEike Ziller2018-01-161-5/+7
| | | | | | | | | | Change-Id: I6b5420ab2275c37e51f665005e31b80b6dfae8cb Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Make IDE name and ids configurable at build timeEike Ziller2018-01-101-0/+4
| | | | | | | | | | | | | | Make it unnecessary to hack app_version.h.in for that. Change-Id: Ibc3bf332916ab9f293b6782d3b5a40078dbd7bcb Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Merge remote-tracking branch 'origin/4.5'Eike Ziller2017-10-251-0/+2
|\ \ | |/ | | | | Change-Id: Iceaa4ca40b5318744bde8a76c6d3ccca08df71bb
| * Disable GCC warning for noexceptMarco Bubke2017-10-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | GCC >= 6.4 is generating warnings for function signature with noexcept. In C++ 17 noexcept is part of the function signature. But the warning is catching cases where a changed signature is not a problem, because it is a template it self. Task-number: QTCREATORBUG-18959 Change-Id: Ia6fa79c10e16d8c96a53c849ea15dcec94538fbe Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
| * Version bump to 4.5-rc1Eike Ziller2017-10-131-3/+3
| | | | | | | | | | Change-Id: I5d7d3ec295feb60ad0d944b4f68344c1857146ad Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Version bump for masterEike Ziller2017-09-271-3/+3
|/ | | | | Change-Id: I0d2a37c4dd7435e55534538b7b2c4d9d69640e14 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.4'Eike Ziller2017-07-251-0/+1
|\ | | | | | | | | | | | | Conflicts: qtcreator.pri Change-Id: If5f4a9821a23ac0df81eb84b3980f9cf7ecd70ba
| * Define COPYRIGHT_YEAR in build filesKai Koehne2017-07-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | This allows us to use the copyright year also in the following patch that adds it as metadata to the windows executable. Ideally we'd unify IDE_YEAR and IDE_AUTHOR (because they're only used together anyway) but that would break translations. Change-Id: If0f84eaeb22e9ba71b2b29798324b76a91eda78f Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Use 4.4 branch from binary artifactsEike Ziller2017-07-051-1/+1
| | | | | | | | | | Change-Id: Id0e016d782f28a61422b9138a862c398b791be2a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Version bumpEike Ziller2017-07-051-3/+3
|/ | | | | Change-Id: Ie00f23af54a9c615756d5f578587879163f708cf Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.3'Orgad Shaneh2017-06-201-1/+1
|\ | | | | | | Change-Id: I126f3a05212a3d5df78812e66285bc9e8078360b
View Lorry Controller Status