Commit Graph

210 Commits

Author SHA1 Message Date
Eike Ziller
437590a999 Merge remote-tracking branch 'origin/4.6'
Change-Id: I49e8b8442e2b5edffbea19cb2bba97443ebc3d2a
2018-01-23 17:06:59 +01: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
0837f974da Merge remote-tracking branch 'origin/4.6'
Conflicts:
	qtcreator.pri

Change-Id: I7dcd8e067b7597144eb3b27d917cb7fe0279aad4
2018-01-19 12:05:11 +01:00
Eike Ziller
47ad489b97 Merge remote-tracking branch 'origin/4.5' into 4.6
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I52986bd2557490431bae48f9db86c848a95592d2
2018-01-17 16:28:18 +01:00
Eike Ziller
205387ad06 Bump displayed copyright year
Change-Id: I5cb95e9b4736279b547208f303a5453f5a4f9dc5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-01-17 13:24:48 +00:00
Eike Ziller
9a57f19552 Bump version
Change-Id: I7ab954a3d696203a392e618933e8f075466af61a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-17 12:44:26 +00:00
Eike Ziller
7872ddde4c Make executable name configurable
Change-Id: I6b5420ab2275c37e51f665005e31b80b6dfae8cb
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2018-01-16 10:53:59 +00:00
Eike Ziller
699dd2c426 Make IDE name and ids configurable at build time
Make it unnecessary to hack app_version.h.in for that.

Change-Id: Ibc3bf332916ab9f293b6782d3b5a40078dbd7bcb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-10 08:45:59 +00:00
Eike Ziller
527fd0fa4c Version bump to 4.5.1
Change-Id: Ifb5656f33cdb4370c1c654c8d98587071528a72f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-12-12 09:32:02 +00:00
Eike Ziller
92a91a38f6 Bump version
Change-Id: Ie823825b9dd4092f9997716790bfc3fbe138dd46
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-24 11:00:03 +00:00
Eike Ziller
7f626b1182 Merge remote-tracking branch 'origin/4.5'
Change-Id: Iceaa4ca40b5318744bde8a76c6d3ccca08df71bb
2017-10-25 16:07:21 +02:00
Marco Bubke
68589a3fbc Disable GCC warning for noexcept
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>
2017-10-24 14:24:08 +00:00
Eike Ziller
89ac5b5603 Version bump to 4.5-rc1
Change-Id: I5d7d3ec295feb60ad0d944b4f68344c1857146ad
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-13 10:01:40 +00:00
Eike Ziller
8645b27880 Version bump for master
Change-Id: I0d2a37c4dd7435e55534538b7b2c4d9d69640e14
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-27 06:48:10 +00:00
Eike Ziller
efa5a7b6d7 Merge remote-tracking branch 'origin/4.4'
Conflicts:
	qtcreator.pri

Change-Id: If5f4a9821a23ac0df81eb84b3980f9cf7ecd70ba
2017-07-25 11:54:44 +02:00
Kai Koehne
68fe72e99a Define COPYRIGHT_YEAR in build files
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>
2017-07-25 09:05:43 +00:00
Eike Ziller
3b8362d0c4 Use 4.4 branch from binary artifacts
Change-Id: Id0e016d782f28a61422b9138a862c398b791be2a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-05 18:50:21 +00:00
Eike Ziller
e016918e5f Version bump
Change-Id: Ie00f23af54a9c615756d5f578587879163f708cf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-05 18:50:10 +00:00
Orgad Shaneh
687466ac47 Merge remote-tracking branch 'origin/4.3'
Change-Id: I126f3a05212a3d5df78812e66285bc9e8078360b
2017-06-20 11:32:02 +03:00
Jake Petroules
5f45bb34ce Fix deployment target on macOS
According to the README, the minimum version is 10.8, but the code did
not reflect that reality.

Change-Id: I2bbaeefe614cba5b5fa8413b68202bb75f346d70
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-12 17:11:57 +00:00
Eike Ziller
82c71fe452 Version bump
Change-Id: Ifb7f3bf865a53b5bab06b2cd58d2a64eecbe2f21
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-24 11:36:34 +00:00
Eike Ziller
01a4d76cc1 Re-enable fast concatenation on macOS again
The old compilers that had issues with it should now long be unsupported

Change-Id: I49a30d1533814877ae4fde9c9bd4e3e64528dfa3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-18 06:24:31 +00:00
Eike Ziller
452a057179 Bump version
Change-Id: I744550af5e37d5863b42534608f2c8289b22c674
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-10 08:09:21 +00:00
Eike Ziller
57b3f7debb Fix version information
master will become 4.4

Change-Id: I2c32496cdf9bad1c46d89e71145034e248e78171
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-04-25 15:43:11 +00:00
Eike Ziller
1891af4b07 Specify Qt Creator's "display version" in qtcreator.pri/qtc.qbs
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>
2017-04-21 13:28:54 +00:00
Eike Ziller
5a6390c544 Version bump for RC
Change-Id: I75dde3f981e3b7d72c181a5f0b582c7261d38e32
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-04-19 08:56:54 +00:00
Eike Ziller
db6c85cdc9 Use 4.3 branch of binary artifacts
Change-Id: I9f41e92bd20f154cb73088b7e723a88fb54c3f02
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-17 08:23:14 +00:00
Eike Ziller
23a3471ee8 macOS: Fix build issue with Qt 5.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>
2017-02-14 08:36:51 +00:00
Eike Ziller
37eddb8ac2 qmake build: Do not require 3rd party plugins to set c++14
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>
2017-01-30 08:21:34 +00:00
Eike Ziller
36b443dfba Add defines for relative data paths
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>
2016-12-01 14:24:53 +00:00
Eike Ziller
062fc3a58e Version bump
Change-Id: I673bd70a9a0df4466b3e1eb4197162fcbd4b2140
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-10-12 08:22:33 +00:00
Orgad Shaneh
0b6c2422b8 Project: Disable deprecated functions
Change-Id: Ifd26ab4237664c0887b521e867cf801a65d49fcd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-10-10 08:16:46 +00:00
Orgad Shaneh
1853f01a5b Merge remote-tracking branch 'origin/4.1'
Change-Id: Ia442f30f387fe9292217582260bbe79e54608810
2016-08-05 11:40:07 +02:00
Oswald Buddenhagen
45b854dbd5 enable c++11 really globally
... 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>
2016-08-02 07:52:38 +00:00
Eike Ziller
fd3a082b84 Version bump
Change-Id: I6b125d5c86e8526281c46d1fbf4cebb36b5f592d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-07-19 06:34:33 +00:00
Eike Ziller
3576b7e128 Version bump
Change-Id: I561cf077846c4bde8294eae7723830f1c8295a13
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-07-06 11:47:58 +00:00
Eike Ziller
637276a2bf Update binary artifacts branch
Change-Id: Ida4dbc9090463642b47744b254c0fc757eca7d81
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-07-06 11:42:34 +00:00
hjk
073a472336 Enable test building using environment variable
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>
2016-05-30 10:23:13 +00:00
Eike Ziller
9b1e2cb48e Add script to create a "dev" package, and allow building against it
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>
2016-05-20 09:59:35 +00:00
David Schulz
8da31c87ee Add version number to lib dependencies on windows.
Change-Id: Ied3707f18cf2753679eeaa2bcff0edfba3c7517e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-18 05:02:40 +00:00
Christian Kandeler
87e8f03c03 Set the right version number on our binaries.
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>
2016-05-13 10:42:18 +00:00
Eike Ziller
0f94aa3f4d Merge remote-tracking branch 'origin/4.0'
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
2016-05-03 11:49:01 +02:00
David Schulz
abeac62191 Fix building creator with the intel compiler.
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>
2016-04-26 12:32:54 +00:00
Eike Ziller
89c2b2cd32 Support make install also on OS X
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>
2016-04-22 06:46:11 +00:00
Eike Ziller
ff238369ae Version bump
Change-Id: I87873a70a4b73130758529c4cd125ec422db7e7e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-04-21 07:59:26 +00:00
David Schulz
610176358b version bump
Change-Id: Ie8f7806fd40af9da5c60f851ef6db5226199bfc0
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-30 05:34:53 +00:00
hjk
82a523f6b1 Relax use of QT_NO_CAST_FROM_ASCII to QT_RESTRICTED_CAST_FROM_ASCII
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>
2016-03-17 16:01:33 +00:00
Eike Ziller
ca6fa32606 Version bump
Change-Id: If3aaffb25f71082194e21c4ce00119957a33d363
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-08 11:52:10 +00:00
Eike Ziller
e492d63aa3 Version bump
Change-Id: Ie9cfae74f7566a171de5fd281c8b2f7885f5a5b2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-12-15 10:57:45 +00:00
Eike Ziller
fb1e9bc785 Version bump
Change-Id: Ibca6fcaf2eeb997179fc9dda0f1dc94dd333d973
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-12-04 08:58:32 +00:00