| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| | |
Change-Id: Ie83666bd18e899dabf5190c360027bf02abecdaf
|
| |
| |
| |
| |
| |
| |
| |
| | |
The string concatenation macros were not set, as opposed to the qmake
build.
Change-Id: I32e2c72c891419ef8352cb7b46e3b7f9b82b6312
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I5d7d3ec295feb60ad0d944b4f68344c1857146ad
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/debugger/debuggerruncontrol.cpp
src/plugins/projectexplorer/gcctoolchain.cpp
Change-Id: Iaad0659293681cce4266fc3e4ba2a4f2068de911
|
| |\
| | |
| | |
| | | |
Change-Id: I9b7cb3d845628abf69a73a279f5a79202c0976c2
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Shadowing modules does no longer work from qbs 1.10 on; we need to give
our implementation of qbsbuildconfig a higher priority.
Change-Id: I703b780d564c43ebc2a4318f683537f10c4e5f3c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ib65ad133f580fe0cca76ea31752134343b986dd6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This fixes a number of deprecation warnings. The require() function was
introduced in qbs 1.8 and is safe to use now.
Change-Id: I915a9f62f36fc64086c7dce60ea753d3e564127c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|/ /
| |
| |
| |
| | |
Change-Id: I0d2a37c4dd7435e55534538b7b2c4d9d69640e14
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I9ab2c68d2bd07b0dd89051a2f5f6fa51676d8594
|
| |
| |
| |
| |
| |
| |
| |
| | |
Starting to use macos qmake scope. 5.6.3 should be around soon so
we can still regression test latest two patch levels.
Change-Id: I14f67a26e26c50f6dd0fb8b621f13780b0b05f76
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I2b5ca4f93456857b0c4ac8b7960982b28f5f0761
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I1f282d5d30f76d9e0a3c2a32bab7de7933d349fa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I7d78ce4ed70a14cfea95cfac4a852ba715e64fb1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
qtcreator.pri
Change-Id: If5f4a9821a23ac0df81eb84b3980f9cf7ecd70ba
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\|
| |
| |
| | |
Change-Id: Iec15792ab28b3d34234d8e564a8ee33808772fa8
|
| |
| |
| |
| |
| | |
Change-Id: Ie05ad37ae7711a6deb152c5aa0a926e9b83b082b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
qtcreator.pri
Change-Id: Ibb67815f6bb33a4c5ddc33b71f9c436624685e11
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
qtcreator.qbs
Change-Id: Ic5e268326d93172208de291d31a716e437b9cedf
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This patch also sets the minimumQbsVersion to 1.7 because that's the version
that is actually documented as being required in the README.
Change-Id: I862daaf5fa34ab2cc5db47581689e08aa34f0910
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|/ /
| |
| |
| |
| | |
Change-Id: Ie00f23af54a9c615756d5f578587879163f708cf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Also don't set the value in more than one place.
Change-Id: Iea1dc1d4e127c12d6333799dda91749eb2d604d4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I126f3a05212a3d5df78812e66285bc9e8078360b
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| | |
Change-Id: Ifb7f3bf865a53b5bab06b2cd58d2a64eecbe2f21
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I744550af5e37d5863b42534608f2c8289b22c674
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
|/
|
|
|
|
|
| |
master will become 4.4
Change-Id: I2c32496cdf9bad1c46d89e71145034e248e78171
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I75dde3f981e3b7d72c181a5f0b582c7261d38e32
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
|
|
|
|
|
| |
Task-number: QTCREATORBUG-13124
Change-Id: I214a92a03a6d0fa75c1cceca1909c68add09d2c8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/qtcreator.qdoc
tests/system/suite_general/suite.conf
Change-Id: Ia298b177d6920a1d853e342b62cf98f7c48a278a
|
| |
| |
| |
| |
| | |
Change-Id: Iba49e6fc6b1d857cc0f87b5bf833f42a4a8a976f
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I013dc48c3aedc3d586f626e47a9e1f306b4bcefe
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ia998360a90a2decc6a7e81f11b64adb367c217b0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I25f835a66200a1f578deff65ca83aeb02c217790
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Avoids the hassle of QRC files and manually registering mime types
- Avoids performance regressions because of mime types that are
registered after mime database has been used
- Makes it technically possible to detect that a disabled plugin could
handle a mime type if it was enabled
Change-Id: I373008b1b56e9c6b4853055f20b3eeb112a6eff9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Our compilers support some features which are part of the C++ 14 feature
set. Some off them are silently compiled with the C++ 11 setting.
For example:
[foo=bar] {}
is actually working with GCC but is part of C++ 14.
Change-Id: Icf2c3806e26c675f8251768c6ad54ba4da186d11
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\|
| |
| |
| | |
Change-Id: I259a402bc896fc2e359cc96b7510453ac9a9a552
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In
commit 31258ec5555d929f4cd33e2836e24b470cf6908b
qbs build: Introduce libclang module.
"llvmVersion" was overlooked.
Because of this, the definition of CLANG_RESOURCE_DIR in
clangcodemodel.qbs led to an invalid path which eventually was
discarded.
Change-Id: Ia1eb50cf738df4affbedc99849bf5326a8e8fb19
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
We should be explicit about where we assume the source files to be. The
base directory might change in the future.
Change-Id: Ifd53c2586f5c67a72ed928130647083d467a3e30
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/clangrefactoring/refactoringengine.cpp
src/tools/clangrefactoringbackend/source/symbolfinder.cpp
Change-Id: I7c1c87f3b8ade43a07f6668565501042e967fa8b
|
| |
| |
| |
| |
| |
| |
| |
| | |
We already ship with a cherry-picked change from version 3.9.
Change-Id: Iad09ac8db470506c5de0321f3a2346c549b11b31
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
|\|
| |
| |
| | |
Change-Id: Ia98031eb87f1859c3736faa0cdd8b655e8a50689
|
| |
| |
| |
| |
| |
| |
| |
| | |
It's "testlib", not "test". And "designercomponents" is actually a
private module.
Change-Id: I1a14d107bb5568b4f3807558ec6ed11937ac816a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ide9a51c899914531e9d23a2adf614d424a2746d8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
|\|
| |
| |
| | |
Change-Id: Ied7c5b01ade2a71e92541fcced2935adcf143421
|
| |
| |
| |
| |
| |
| | |
Change-Id: I251567529ec33ef76043006c68749724208cc811
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Adapt qmake and qbs files, fixing warnings on Windows:
clangutils.cpp(78): warning C4129: 'o': unrecognized character escape sequence
clangutils.cpp(78): warning C4129: 'L': unrecognized character escape sequence
clangutils.cpp(78): warning C4129: 'l': unrecognized character escape sequence
Change-Id: I7a5fe674665437582457645f2a081e1e38d5df77
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|