feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
68,568 Commits 108 Branches 368 Tags
ac47d51bfb379b8c3b51d832d54a90dba18a518f
Commit Graph

319 Commits

Author SHA1 Message Date
Eike Ziller
4894afee52 Bump version -> 4.12 beta2 
Change-Id: I9da6834efe5d1423dc3d5a47d9472c50dc26d44c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2020-03-06 14:19:52 +00:00
Christian Stenger
cf0e0be544 Qbs: Fix QC version branding 
Change-Id: Idb15a97db6637c0218053c3754e09716a52a2f96
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2020-02-13 13:17:05 +00:00
Eike Ziller
0795a5ae6f Merge remote-tracking branch 'origin/4.11' 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I4e339410b17df4098f17e3bb621e1c02e3f8026b
 2020-02-07 10:41:09 +01:00
Eike Ziller
ca42bf7696 Bump version to 4.11.2 and copyright year to 2020 
Change-Id: I8e97c8f3e38dd1a6fe64e47cd30d73d3d5622425
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2020-02-06 11:41:42 +00:00
Christian Kandeler
c2501dc938 qbs build: Add litehtml support 
Change-Id: Ia78ab35a5e844d5b2a1ee18752445c887228981f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2019-12-19 13:42:34 +00:00
Eike Ziller
0d005b7057 Version bump to 4.11.1 
Change-Id: I31c53f92acd02c380e44ecea534b178a3fb5458c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2019-12-16 12:20:53 +00:00
Eike Ziller
76c54f5201 Update version to 4.12 beta 
Change-Id: I13641e62b01b126493be852e5db3ef76044918f7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2019-12-06 10:22:52 +00:00
Eike Ziller
50fad4f0f9 Bump version to 4.11.0 
Change-Id: I167a84606f707529e21c208d019241ed8d7c0ce0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2019-11-29 13:43:54 +00:00
Eike Ziller
4843216192 macOS: Fix execution of helper executables with UI 
The qt.conf that is written into the Resources/ folder
is used for the main Qt Creator executable, so that cannot
be used for the helper executables.

Move the executables one more level down and add a separate qt.conf
for them.

Fixes: QTCREATORBUG-23120
Change-Id: Icd8842d246a1bc0e8d44656e2bc580d6698afbda
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2019-11-05 12:31:40 +00:00
Eike Ziller
715db5ada8 Bump version -> 4.11.0-rc1 
Change-Id: I495bd3961c718a2090ac1999f56c195e95cd53b1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2019-11-04 11:59:19 +00:00
Eike Ziller
163faba8ff Bump version -> 4.11 beta2 
Change-Id: Iea7b87cc19309eb4c3a921fa29d1b40170aaacc8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2019-10-21 08:45:26 +00:00
Tim Jenssen
333b33edbe Merge remote-tracking branch 'origin/4.10' 
Change-Id: Iaf27911e4e9fb762c1a24c84c458462bafe95728
 2019-07-12 15:53:56 +02:00
Christian Kandeler
b21d0485d0 qbs build: Suppress GCC 9 warnings also in qbs submodule 
Amends 7b2d41a972.

Change-Id: I3500b57fa2424f522ffe16e5413a7593601215c0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2019-07-09 09:26:32 +00:00
Tim Jenssen
1df6443d4a Merge remote-tracking branch 'origin/4.10' 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/libs/utils/synchronousprocess.cpp
	src/plugins/baremetal/iarewtoolchain.cpp
	src/plugins/cmakeprojectmanager/cmakeproject.cpp
	tests/unit/unittest/CMakeLists.txt

Change-Id: I124ad492df403286751e175d27fe36487ddf6d07
 2019-07-04 15:17:55 +02:00
Christian Kandeler
7b2d41a972 qbs build: Suppress some GCC 9 warnings 
Otherwise, we get thousands of warnings from Qt, e.g.:
    qvariant.h:275:25: warning: implicitly-declared ‘constexpr QVariant::Private& QVariant::Private::operator=(const QVariant::Private&)’ is deprecated [-Wdeprecated-copy]

Change-Id: I8b3bbfae6791adca8bcfacc7ad5ab46701474aa4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2019-07-02 13:47:56 +00:00
Eike Ziller
b3de8fc809 Bump version to 4.10.0-rc1 
Change-Id: I95991a4f46be2f2bc1600ca38d14b9b03269fc0b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2019-06-28 11:05:00 +00:00
Eike Ziller
52b9248385 Merge remote-tracking branch 'origin/4.10' 
Change-Id: I452d5cbf27c1a0d43a890cef74cb8f0b9646bf60
 2019-06-21 10:53:18 +02:00
Eike Ziller
bd3037464e Bump version 
Change-Id: I5d2298e71837e3c146196f75a9bd1472771f1949
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2019-06-20 12:05:00 +00:00
Orgad Shaneh
8827d83115 Clang: Centralize -Wno-comment for GCC 
It's also needed in clangrefactoringbackend, unittest etc...

Change-Id: I9c758d52b34798d75610a4633bc7c5e7ceb0c00b
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
 2019-04-23 15:34:01 +00:00
Ivan Donchevskii
53c407bc0c Clang: Fix build with clang-8 
Clang-Tidy checks and Clazy flags updated.
CLANG-UPGRADE-CHECK done.

Change-Id: I1ca585c5c3c77a7f183719df9c262603150914e8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
 2019-04-17 12:13:36 +00:00
Orgad Shaneh
82bf5e2906 Qbs: Enable ClangRefactoring by default 
This amends commit 89e70ca785.

Change-Id: I09f7075075e2244a031e4c20496272f382ec020d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2019-04-11 21:50:45 +00:00
Orgad Shaneh
cbfc6e522d Merge remote-tracking branch 'origin/4.9' 
Change-Id: I801042a53ae4d02d1891ea582ca9ea89b00d3181
 2019-03-01 13:06:57 +02:00
Christian Kandeler
52ec46a60f Fix build of command-line qbs with qbs 
The plugin path we pass as a define to the qbs sources contained the "/
qbs/plugins" suffix which qbs already adds itself. Therefore, the
command-line qbs was not functional.

Change-Id: I2bfb967f998e69bbe4da760a1f517e1f40e4f055
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
 2019-02-25 08:41:10 +00:00
Nikolai Kosjar
61775a844e Clang: Build clangformat only if clang/Format/Format.h exists 
...in the LLVM_INSTALL_DIR.

Change-Id: I974f32759bca7fb467524bf61ff7967098748f0e
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
 2019-02-21 09:10:03 +00:00
Alessandro Portale
88d1d92728 Bump minimum Qt version (to build Qt Creator) to 5.11 
Recent adaptations to Qt 5.13's API deprecations require using APIs
which were introduces in Qt 5.11.

Change-Id: I6c077d824c9ce716e019543b290c355a5d512fad
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2019-02-15 14:39:12 +00:00
Eike Ziller
67b3d25624 Merge remote-tracking branch 'origin/4.9' 
Conflicts:
	qtcreator.pri

Change-Id: I278bc79cb64705471b360d0b8d06a8db17db7904
 2019-02-08 12:48:19 +01:00
Eike Ziller
d07d75a08a Merge remote-tracking branch 'origin/4.8' into 4.9 
Conflicts:
	qtcreator.pri

Change-Id: I84dc8b9c7a029f2f40c4fa3ef78eef338247a6c0
 2019-02-08 12:44:49 +01:00
Eike Ziller
523ddee6c0 Bump version 
Change-Id: I90fac436cdab41739633c383445003a3c8f9feae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2019-02-07 15:14:35 +00:00
Eike Ziller
5481a35b98 Bump copyright year 
Change-Id: I532c92311fda448fc272ab31e26ad562d9fb3ce5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2019-02-07 14:34:26 +00:00
Eike Ziller
88b29792cb Merge remote-tracking branch 'origin/4.8' into 4.9 
Conflicts:
	src/plugins/android/androidrunnerworker.cpp
	src/plugins/android/androidrunnerworker.h

Change-Id: I52b9117c8a57dc4a34cfc09d1ae9bc76e0752bfc
 2019-02-04 15:21:55 +01:00
Christian Kandeler
ffa14187a1 qbs build: Fix regression with qbs 1.13 
Don't fall back to pkg-config for non-existing dev headers products, as
that becomes expensive.

Change-Id: Ibf51a93950e04ee061ca16444fbc18349389d74a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2019-02-04 10:11:30 +00:00
Eike Ziller
e6fe143795 Bump version to 4.8.2 
Change-Id: I99f7baaab46a157f37e72619b71e968b37c330f4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2019-01-17 12:35:25 +00:00
Nikolai Kosjar
10958d88f6 Clang: Fix detection of clang with qbs 
"res" was undefined.

Amends 2379007c17.

Change-Id: I3af0e94c70fcb6b5b1b8027383e767a5d9cd8238
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2019-01-03 10:42:40 +00:00
Orgad Shaneh
2379007c17 Clang: Suppress GCC warning with LLVM 7.0.1 
Change-Id: I6de160b42472560a3b33d9a3390b0890eabe9d44
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
 2018-12-19 10:54:17 +00:00
Christian Kandeler
d7178b88c4 SSH: Use OpenSSH tools 
... instead of our own SSH library.

Advantages:
    - Full compatibility with OpenSSH behavior guaranteed.
    - Minimal maintenance effort.
    - Less code to build.
    - Big chunk of 3rd party sources can be removed from our repository.

One the downside, Windows users now need to install OpenSSH for
RemoteLinux support. Hoewever, people doing embedded development
probably have it installed anyway.

[ChangeLog] Switched SSH backend to OpenSSH

Fixes: QTCREATORBUG-15744
Fixes: QTCREATORBUG-15807
Fixes: QTCREATORBUG-19306
Fixes: QTCREATORBUG-20210
Change-Id: Ifcfefdd39401e45ba1f4aca35d2c5bf7046c7aab
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
 2018-12-13 15:10:11 +00:00
Eike Ziller
b79c0628e5 Bump version to 4.8.1 
Change-Id: Ic5447ccb1e0a5e9b181d4210b2c84b526681c6da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2018-12-10 07:29:24 +00:00
Eike Ziller
a47fdf33a2 Version for master is 4.9.0-beta1 
Change-Id: I2c3ca4910147445c4493828df5c6252f30379dc9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2018-11-29 12:37:55 +00:00
Eike Ziller
ca33c0b8c1 Bump version to 4.8.0 
Change-Id: I593dc1905bd4e2240449fb9f393c2c14b73488f1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2018-11-26 10:14:01 +00:00
Orgad Shaneh
7c17edcce2 Clang: Strip some more warnings 
Appear in pchtaskgenerator-test.cpp and builddependenciesprovider-test.cpp.

Change-Id: I4f9f2660655e0dfc1002980ae31bc09288110b2d
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
 2018-11-22 14:15:46 +00:00
Eike Ziller
b8156fdfe0 Version bump to 4.8 RC1 
Change-Id: I67dbd98002f270bc053f3680adcf51034cde4593
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2018-11-19 09:10:51 +00:00
Orgad Shaneh
91649cf274 Clang: Remove some warning flags provided by LLVM 
Clang unit tests produce many warnings with GCC8 and
these flags (-Wnon-virtual-dtor, -Woverloaded-virtual).

Change-Id: I54a4c9c5b2f12da3c3898fc6f3beca0d4dfe478c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
 2018-11-15 10:01:27 +00:00
Orgad Shaneh
3b30bfa35f Clang: Default to llvm-config-7 
Change-Id: Id29095f378268b55430e715ec7d37f5a52159df5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
 2018-11-15 09:54:07 +00:00
Christian Kandeler
bb15dde8a7 Documentation: Fix qbs build 
Amends 1e1c212090 and 54208113ee.

Change-Id: I1f15a118b40513382e4e1d5767781865d4458ce9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2018-11-14 14:22:24 +00:00
Orgad Shaneh
ea10f4d9da Increase QT_DISABLE_DEPRECATED_BEFORE to 5.9 
Change-Id: I16b1fe72a9f9b87a8e7676a1591a5254d4005fad
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2018-11-12 08:29:24 +00:00
Nikolai Kosjar
3160172b58 ClangFormat: Fix constructing libs for qbs 
Assignment after concat() was missing.

Change-Id: I9a038cae6372648561a5450e9e3417c4c603ab7e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2018-10-16 11:06:22 +00:00
Eike Ziller
50d9e58ede Bump version to 4.8 beta2 
Change-Id: Ie8034adcc95a188d5a78a71b303fc073ea1d6a3c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2018-10-12 08:19:23 +00:00
Ivan Donchevskii
e0d7d03720 Clang: Fix ClangFormat build with clang-7 
Change-Id: I0859b7aad1a49f8d46ee4b32cc32039cfa0b482b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2018-10-05 11:08:27 +00:00
Alexandru Croitor
9da9ed45e9 Fix qbs build of clangformat plugin 
Change-Id: Ic23a34048c62ed39590ad422ea3e4f8fea9fc5a1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2018-09-25 06:03:49 +00:00
Christian Kandeler
3336baad12 Fix references to the clang code model documentation file 
Was forgotten in 7ab07a4e8f.

Change-Id: I2c6d21b79658e3946eb6ecdcf7b11992c0bf865e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
 2018-08-20 11:58:18 +00:00
Eike Ziller
db9837fa6c Merge remote-tracking branch 'origin/4.7' 
Conflicts:
	src/plugins/clangtools/clangtoolruncontrol.cpp
	src/plugins/cpptools/compileroptionsbuilder.cpp

Change-Id: Ib1e8abf066898b50c90fc1ccba4697fe983e8a8f
 2018-08-15 13:53:28 +02:00