Commit Graph

183 Commits

Author SHA1 Message Date
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
Eike Ziller
411c79a599 Version bump and use binary artifacts 3.6
Change-Id: I57f643b0400c945f2bfe3513ef23a9eccc083100
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-10-30 08:44:36 +00:00
Eike Ziller
5c77df1268 Merge remote-tracking branch 'origin/3.5'
Conflicts:
	qtcreator.pri

Change-Id: I87576b71cee9f2f4eb856531f1a8816b1d3738db
2015-09-30 11:01:24 +02:00
Eike Ziller
6dca1499ac Allow different destination directory than Qt Creator build directory
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>
2015-09-30 08:55:27 +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
08f12ed431 Version bump
Change-Id: I6f47ca6b9cd2058b3ad3fd1a815a296461777808
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-24 08:23:18 +00:00
Eike Ziller
80766578a2 Version bump
Change-Id: Ibb3790fe4b4bfcbd808f611ce9fa2f0427022a4a
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-08-07 14:19:12 +00:00
Eike Ziller
26eca3d15a Version bump
Change-Id: I3176d21a40001779bf6c19b05a3f9ff068695a8e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-07-10 12:23:48 +00:00
Eike Ziller
d6da70916d Merge remote-tracking branch 'origin/3.5' 2015-07-10 14:08:29 +02:00
Eike Ziller
387e4917a6 Version bump
Change-Id: I9f8d177d34cc277fdea51da5224fbc4c7ee8a589
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-07-09 13:50:05 +00:00
Christian Kandeler
6d5a5aff94 Use a proper libexec path for Unix builds.
Change-Id: I036c806af47f07e60408a90d3a4e181a6773f866
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-07-09 09:08:01 +00:00
Eike Ziller
aee54f9df5 Merge remote-tracking branch 'origin/3.4' 2015-03-19 16:00:28 +01:00
Orgad Shaneh
70c475c847 Project: Exclude project directory from include path
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>
2015-03-16 12:41:30 +00:00
Eike Ziller
d519514810 Pull 3.4 binary artifacts
To get the msvc2013 runtime installer

Change-Id: Id2c8fe8464bbd1d7ab30d265439360f8111e8b62
Task-number: QTCREATORBUG-14130
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-03-12 13:30:58 +00:00
Eike Ziller
0763f44504 Bump version
Change-Id: I5ae9ff3bbda235781b490889be292af7812e720e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-18 08:23:37 +00:00
Eike Ziller
df3176d5e3 Merge remote-tracking branch 'origin/3.3' 2015-01-14 16:06:46 +01:00
Orgad Shaneh
a690828cca MSVC: Suppress unsafe template usage warnings
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>
2015-01-12 13:26:41 +01:00
Eike Ziller
75ae6169a8 Version bump
Change-Id: I44f6026c98e6d05ccf42cb634e6b95fa5a724a62
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-11 11:20:44 +01:00
Eike Ziller
5c6f982636 Version bump
Change-Id: Ieacb686c9c241159054543e2501d0354a63c1853
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-01 16:03:07 +01:00
Robert Loehning
06a47dd56c Version bump
Change-Id: I4c4a77b22cbc46b2970c89ed4b50f0c6338eb575
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-28 16:55:15 +01:00
Eike Ziller
3335e8a475 Version bump
Change-Id: If2233d241e83f82400e4e910e405eabebf887d58
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-28 11:28:57 +01:00
Eike Ziller
4f6ab1a7bd New branch for binary artifacts
Change-Id: I77f0a248c934e19f89c590577269d2fea537ae00
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-10-16 16:05:09 +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
Christian Kandeler
847f10e9cc Remove Qt version checks.
Qt 5.3 is the minimum requirement these days. Remove all fallback code
from sources and project files.

Change-Id: If6188a471197acadda4d6baee71804ba1a8026c6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-08 10:33:25 +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
Christian Kandeler
1d5091e48f Do not use deprecated Qt functionality.
Replace all* remaining deprecated Qt 4 functions with
their Qt 5 counterparts. This means we no longer need to
define the QT_DISABLE_DEPRECATED_BEFORE macro.
This patch is relatively small because most source-compatible
changes of this kind have been done before.

* The one exception is the QmlDesigner, which uses QWeakPointer
in a deprecated way all over the place.

Change-Id: Id4b839c6685f3b5bdf2b89137f95231758ec53c7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-08-29 14:10:41 +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
Eike Ziller
f42358a16e Fix version number.
Change-Id: I657277feb77f33b345f58729cdc1c05b1fdb5528
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-22 16:35:17 +02:00