aboutsummaryrefslogtreecommitdiffstats
path: root/qtcreator.pri
Commit message (Collapse)AuthorAgeFilesLines
...
* | Re-enable fast concatenation on macOS againEike Ziller2017-05-181-2/+3
| | | | | | | | | | | | | | The old compilers that had issues with it should now long be unsupported Change-Id: I49a30d1533814877ae4fde9c9bd4e3e64528dfa3 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Fix version informationEike Ziller2017-04-251-4/+4
|/ | | | | | | master will become 4.4 Change-Id: I2c32496cdf9bad1c46d89e71145034e248e78171 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Specify Qt Creator's "display version" in qtcreator.pri/qtc.qbsEike Ziller2017-04-211-0/+1
| | | | | | | | | | | | | | Currently it is set by passing defines to qmake, which complicates package build setups. Set the display version where the numerical version is defined. This also makes it available to developer builds. Also switch around the display version and numerical version in the about dialog, since e.g. "4.3.0-rc1" is more descriptive than "4.2.83". Change-Id: I26dda427975acdc6cc169f8d625f57918167cf19 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Version bump for RCEike Ziller2017-04-191-2/+2
| | | | | Change-Id: I75dde3f981e3b7d72c181a5f0b582c7261d38e32 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Use 4.3 branch of binary artifactsEike Ziller2017-03-171-1/+1
| | | | | Change-Id: I9f41e92bd20f154cb73088b7e723a88fb54c3f02 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* macOS: Fix build issue with Qt 5.6Eike Ziller2017-02-141-0/+6
| | | | | | | | | | std::future is disabled when compiling with target 10.7, so we need to enforce 10.8 when building against Qt 5.6 which has default deployment target 10.7 Change-Id: I8d7b2646d0fb5268f82f5e01dae1f7e40a80bb8b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* qmake build: Do not require 3rd party plugins to set c++14Eike Ziller2017-01-301-0/+2
| | | | | | | | | | | | | Do it in qtcreator.pri instead again, since that is supposed to be included by projects depending on Qt Creator. Since we will use C++14 in utils/algorithm.h and other prominent places, it would be very annoying to require setting C++14 on all external plugins. Change-Id: Ie11a30b33c791f3bf6db39fcee454f1e887352c2 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Add defines for relative data pathsEike Ziller2016-12-011-0/+9
| | | | | | | | | Derive the relative paths used in code from the paths used by the build system. Change-Id: I208ee55d3c1ee76921734f5c1c6c40d3fcb9724c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Version bumpEike Ziller2016-10-121-2/+2
| | | | | Change-Id: I673bd70a9a0df4466b3e1eb4197162fcbd4b2140 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Project: Disable deprecated functionsOrgad Shaneh2016-10-101-1/+5
| | | | | | Change-Id: Ifd26ab4237664c0887b521e867cf801a65d49fcd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.1'Orgad Shaneh2016-08-051-3/+0
|\ | | | | | | Change-Id: Ia442f30f387fe9292217582260bbe79e54608810
| * enable c++11 really globallyOswald Buddenhagen2016-08-021-3/+0
| | | | | | | | | | | | | | | | | | ... and remove all instances that became redundant now. this excludes everything that comes from outside qtc, or looks like it could "leave" it. Change-Id: Idc8baad17cd1ffdc5e160ec48ea3292d633a2562 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Version bumpEike Ziller2016-07-191-3/+3
|/ | | | | Change-Id: I6b125d5c86e8526281c46d1fbf4cebb36b5f592d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Version bumpEike Ziller2016-07-061-2/+2
| | | | | Change-Id: I561cf077846c4bde8294eae7723830f1c8295a13 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Update binary artifacts branchEike Ziller2016-07-061-1/+1
| | | | | Change-Id: Ida4dbc9090463642b47744b254c0fc757eca7d81 Reviewed-by: David Schulz <david.schulz@qt.io>
* Enable test building using environment variablehjk2016-05-301-0/+3
| | | | | | | | | | Makes it easy to globally opt-in to testable Creator builds, by avoiding the need to remember adding BUILD_TEST=x each time one runs qmake in a fresh Creator build. Change-Id: Ic1ea9efd05dbdac1e402f245b5320ee5ff33ae91 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Add script to create a "dev" package, and allow building against itEike Ziller2016-05-201-2/+12
| | | | | | | | | | | | | Collects all the needed data from a source and build directory, which then can be used instead of a source directory in combination with an installed Qt Creator, to build plugins. On Windows and OS X the plugin can still only built in the same mode (release or debug) as the used Qt Creator install. Change-Id: I21119cc0681f1a5f657c969f5d1e7a23d69aedfe Reviewed-by: Marco Benelli <marco.benelli@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* Add version number to lib dependencies on windows.David Schulz2016-05-181-1/+10
| | | | | | Change-Id: Ied3707f18cf2753679eeaa2bcff0edfba3c7517e Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* Set the right version number on our binaries.Christian Kandeler2016-05-131-0/+1
| | | | | | | | | | While we have not encountered issues so far with using the default values, it seems more correct to set the version so that e.g. on Unix a library's soname contains the actual Qt Creator major version etc. For good measure, also set the compatibility version on OS X. Change-Id: I956c473e0b440fc87ffe1aaf99af626da733b5fb Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.0'Eike Ziller2016-05-031-1/+1
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/debugger/debuggerruncontrol.cpp src/plugins/projectexplorer/projectwizardpage.cpp src/plugins/projectexplorer/xcodebuildparser.h src/plugins/qmldesigner/qmldesignerplugin.cpp src/tools/clangbackend/ipcsource/translationunits.cpp Change-Id: Ibf0857cf8dbf95fc9ac13d5c2112b3f4a2ca7de6
| * Fix building creator with the intel compiler.David Schulz2016-04-261-1/+1
| | | | | | | | | | | | | | | | | | Replacing all occurrences of win32-msvc* with msvc. Task-number: QTCREATORBUG-16118 Change-Id: I46bd54628bffb04c24bca587fd9dd7684e888f1a Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Version bumpEike Ziller2016-04-211-2/+2
| | | | | | | | | | Change-Id: I87873a70a4b73130758529c4cd125ec422db7e7e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * version bumpDavid Schulz2016-03-301-3/+3
| | | | | | | | | | Change-Id: Ie8f7806fd40af9da5c60f851ef6db5226199bfc0 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Support make install also on OS XEike Ziller2016-04-221-0/+9
| | | | | | | | | | | | | | | | It can be helpful, is not much effort, and parts did not restrict the install target to non-OS X already. Change-Id: I3501f37f089e981cf3f72d9250c9b9161d1565d6 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Relax use of QT_NO_CAST_FROM_ASCII to QT_RESTRICTED_CAST_FROM_ASCIIhjk2016-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an opt-in trade-off between type safety and user code convenience. QT_NO_CAST_FROM_ASCII is highly beneficial to avoid unintended conversions from 8 bit data with potentially "unsuitable" encodings to QString. However, it has the undesirable side-effect to require user code to wrap character and string literals in QLatin1Char(...) and QLatin1String(...) or use similar construction, cluttering the code significantly. QT_RESTRICTED_CAST_FROM_ASCII macro works almost as QT_NO_CAST_FROM_ASCII, except that it enables the QChar(char) constructor and adds an additional QString(const char (&ch)[N]) constructor that matches C++ string literals, but no arbitrary character pointers. This avoids a significant share of the need to clutter the user code by only a slight relaxation of the type-safety. Change-Id: I64e0430bb1352edcedf7e19ee25c16408727084c Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Version bumpEike Ziller2016-03-081-2/+2
|/ | | | | Change-Id: If3aaffb25f71082194e21c4ce00119957a33d363 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Version bumpEike Ziller2015-12-151-3/+3
| | | | | Change-Id: Ie9cfae74f7566a171de5fd281c8b2f7885f5a5b2 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Version bumpEike Ziller2015-12-041-2/+2
| | | | | Change-Id: Ibca6fcaf2eeb997179fc9dda0f1dc94dd333d973 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Version bump and use binary artifacts 3.6Eike Ziller2015-10-301-3/+3
| | | | | Change-Id: I57f643b0400c945f2bfe3513ef23a9eccc083100 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.5'Eike Ziller2015-09-301-15/+37
|\ | | | | | | | | | | | | Conflicts: qtcreator.pri Change-Id: I87576b71cee9f2f4eb856531f1a8816b1d3738db
| * Allow different destination directory than Qt Creator build directoryEike Ziller2015-09-301-14/+36
| | | | | | | | | | | | | | | | | | | | This is useful for compiling and packaging plugins separately from Qt Creator, where we want to keep the structure of the compilation result the same as, but separately from, the Qt Creator build directory. Change-Id: I307f119fc7901e00790ec85bfb01cc3ba5fa6e85 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
| * Version bumpEike Ziller2015-08-241-1/+1
| | | | | | | | | | Change-Id: I6f47ca6b9cd2058b3ad3fd1a815a296461777808 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
| * Version bumpEike Ziller2015-08-071-2/+2
| | | | | | | | | | Change-Id: Ibb3790fe4b4bfcbd808f611ce9fa2f0427022a4a Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Use variables for install locationsEike Ziller2015-09-221-0/+10
| | | | | | | | | | | | | | | | | | | | 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>
* | Version bumpEike Ziller2015-07-101-3/+3
| | | | | | | | | | Change-Id: I3176d21a40001779bf6c19b05a3f9ff068695a8e Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Merge remote-tracking branch 'origin/3.5'Eike Ziller2015-07-101-3/+3
|\|
| * Version bumpEike Ziller2015-07-091-3/+3
| | | | | | | | | | Change-Id: I9f8d177d34cc277fdea51da5224fbc4c7ee8a589 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Use a proper libexec path for Unix builds.Christian Kandeler2015-07-091-1/+4
|/ | | | | | Change-Id: I036c806af47f07e60408a90d3a4e181a6773f866 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.4'Eike Ziller2015-03-191-1/+3
|\
| * Project: Exclude project directory from include pathOrgad Shaneh2015-03-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Some environments include the project directory by default, and some don't (e.g. qbs). In order to avoid compilation errors on the environments that don't, unconditionally exclude the project directory. Change-Id: I8552a269735b42efff1839fb18ce863eed711b7a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
| * Pull 3.4 binary artifactsEike Ziller2015-03-121-1/+1
| | | | | | | | | | | | | | | | To get the msvc2013 runtime installer Change-Id: Id2c8fe8464bbd1d7ab30d265439360f8111e8b62 Task-number: QTCREATORBUG-14130 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Bump versionEike Ziller2015-02-181-2/+2
|/ | | | | Change-Id: I5ae9ff3bbda235781b490889be292af7812e720e Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.3'Eike Ziller2015-01-141-0/+1
|\
| * MSVC: Suppress unsafe template usage warningsOrgad Shaneh2015-01-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\INCLUDE\algorithm(1119) : warning C4996: 'std::_Transform1': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators' c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\INCLUDE\algorithm(1100) : see declaration of 'std::_Transform1' d:\projects\qt-creator\qt-creator\src\libs\utils\algorithm.h(249) : see reference to function template instantiation '_OutIt std::transform<QList<T>::const_iterator,Utils::`anonymous-namespace'::QSetInsertIterator<Container>,F>(_InIt,_InIt,_OutIt,_Fn1)' being compiled with [ _OutIt=Utils::`anonymous-namespace'::QSetInsertIterator<QSet<QString>>, T=QString, Container=QSet<QString>, F=std::tr1::function<QString (const QString &)>, _InIt=QList<QString>::const_iterator, _Fn1=std::tr1::function<QString (const QString &)> ] d:\projects\qt-creator\qt-creator\src\libs\utils\algorithm.h(317) : see reference to function template instantiation 'C Utils::TransformImpl<C,SC>::call<F>(const SC &,F)' being compiled with [ C=QSet<QString>, SC=QStringList, F=std::tr1::function<QString (const QString &)> ] D:\Projects\qt-creator\qt-creator\src\libs\utils\codegeneration.cpp(113) : see reference to function template instantiation 'QSet<T> Utils::transform<QSet,QStringList,std::tr1::function<_Fty>>(const SC &,F)' being compiled with [ T=QString, _Fty=QString (const QString &), SC=QStringList, F=std::tr1::function<QString (const QString &)> ] Change-Id: Iaf7c5fcdfbf5961b92c30b1d37b18e5476f6b7e1 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
| * Version bumpEike Ziller2014-12-111-1/+1
| | | | | | | | | | Change-Id: I44f6026c98e6d05ccf42cb634e6b95fa5a724a62 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
| * Version bumpEike Ziller2014-12-011-2/+2
| | | | | | | | | | Change-Id: Ieacb686c9c241159054543e2501d0354a63c1853 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Version bumpRobert Loehning2014-11-281-3/+3
|/ | | | | Change-Id: I4c4a77b22cbc46b2970c89ed4b50f0c6338eb575 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Version bumpEike Ziller2014-10-281-2/+2
| | | | | Change-Id: If2233d241e83f82400e4e910e405eabebf887d58 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* New branch for binary artifactsEike Ziller2014-10-161-1/+1
| | | | | Change-Id: I77f0a248c934e19f89c590577269d2fea537ae00 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 00:41:39 +0000