Commit Graph

162 Commits

Author SHA1 Message Date
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
Eike Ziller
08f12e95d0 Update binary-artifacts branch setting
Change-Id: I779a7c3a12d03f0d1920c89b38b019b81502712b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-15 15:34:55 +02:00
Eike Ziller
69fe69f6ba Version bump
Change-Id: Iceded20db5c4d18b3ae075f99faacb351967277c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-08 13:23:32 +02:00
Eike Ziller
e5504be861 Version bump
Change-Id: Id327afba79a865cf64b64fd817efe5c8b8797043
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-07 16:54:53 +02:00
Eike Ziller
6ca4be0e3a Support qmake variable as well as environment variable for QTC_PLUGIN_DIRS
So it can be set through .qmake.conf in a subdirs project above it.

Change-Id: I53c7ba96c1df916b7c81c816ec0559a1e147a84b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-06-30 17:50:23 +02:00
Orgad Shaneh
e9aaf21517 Centralize addition of plugin library paths
Change-Id: I9ddcc193b4d927c3d566eeb81c41f79a75920696
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-05-08 15:29:21 +02:00
Orgad Shaneh
b9f79cbd01 Clean some trailing whitespace
Change-Id: I71bb0436ff06cb8981bf465ef42640b622a9f2bc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-05-07 16:19:47 +02:00
Oswald Buddenhagen
f013c41d05 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp

Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
2014-03-27 18:20:00 +01:00
hjk
66f2793cbf Allow list of plugin directories to be passed in QTC_PLUGIN_DIRS
Change-Id: Ied926ed78f24d06ff0ff693d768e12ecb505ccbf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-03-24 19:25:11 +01:00
Eike Ziller
1911530f75 Mac/Qt4: Allow compilation with macx-clang mkspec too
Change-Id: I91752859f790b5576db7ec8678c58924f643187c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-07 14:43:39 +01:00
Eike Ziller
23e6a0ac09 Make C++11 unconditional
Change-Id: I88d6f99a1fa714386337589e1edda66b66091151
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-05 12:21:06 +01:00
Eike Ziller
5e7b693651 Version bump
Change-Id: Ibb0d0d64f379684b1ae8f7cd55a8a5436056432b
2014-03-03 10:27:59 +01:00
Eike Ziller
0d08b6f21d Update binary artifacts branch
Change-Id: Iea998510555e3762e6a8457bb6e998c3533c2dee
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-02-25 18:29:16 +01:00
Eike Ziller
9e40e5f7b0 Version bump
Change-Id: I005fb91b5e3cd5956edb108d0ec730db64cc98e9
2014-02-25 13:16:28 +01:00
Eike Ziller
b03a981a41 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/shared/qbs

Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7
2014-02-11 09:14:22 +01:00
Kai Koehne
f33e05dc6e Enable C++11 on all platforms except Mac/release
This allows us to profit from the Qt extensions for C++11, and also
makes sure e.g. QTC_OVERRIDE is consistenly checked. We can't enable
it (yet) for Mac/release though to be able to deploy to 10.6 ..

Change-Id: Icd26ab5f971532ff10a892221c653987026ac88d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-06 15:28:26 +01:00
Eike Ziller
51af63bb9e Version bump
Change-Id: Ie852069d4c3f01eb021837644865fdea41a34c54
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-29 10:38:07 +01:00
Kai Koehne
79f72f7a89 Pick up QTC_PLUGIN_DIRS from environment
Setting QTC_PLUGIN_DIRS as an environment variable is easier
to manage than passing it every time explicitly to e.g. the qmake
call. It also is in line with other environment variables used in
Qt Creator, like WITH_LLDB, QT_BREAKPAD_ROOT_PATH etc.

Change-Id: Ief94aaf7c2a16ee62dcbf27c9f217496b1f74ad5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-01-23 12:21:14 +01:00
Eike Ziller
8cad383b80 Merge remote-tracking branch 'origin/3.0' 2013-12-18 15:10:58 +01:00
Eike Ziller
83a3705912 Fix build with Qt4
Change-Id: I1ef1f20d776f955c2f08d551dbac1621b98c0961
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-12-18 12:51:43 +01:00
Eike Ziller
e035ae6df1 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	share/qtcreator/debugger/stdtypes.py
	src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp

Change-Id: I5d86746d58960e41e01e725ccb2a6c00890f0dfd
2013-12-18 11:02:16 +01:00
Kai Koehne
27563451cb Allow plugins to depend on plugins outside of creator source tree
Do try to resolve plugin_dependencies.pri files in all directories
set by QTC_PLUGIN_DIRS. Also fail if a dependencies_pri file cannot
be resolved.

Change-Id: I2c14db832cef0fcc97a2f0351847c4969f5bd420
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-12-17 08:54:03 +01:00