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

189 Commits

Author SHA1 Message Date
Eike Ziller
6bb918adab Merge remote-tracking branch 'origin/4.15' 
Change-Id: Ic839ab43a723ab22cc83e5b0d823ec6121cb6701
 2021-05-10 13:50:58 +02:00
Christian Kandeler
8d44ae5d7e sqlite: Fix qbs build 
Change-Id: I919fd20c445510231e66c08d3dafd5c1b5696ac7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2021-05-07 14:14:10 +00:00
Eike Ziller
bf5b1d714c Revert "Revert "Merge remote-tracking branch 'origin/4.15'"" 
This reverts commit f0a86d4510.

Reverting a merge doesn't "undo" it - the changes would be lost
forever even with subsequent merges.
So we need to revert the revert to get the changes.

Change-Id: I65928f876f4dc886561bed17c4b2aa42b388c1e3
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
 2021-05-07 09:07:40 +00:00
Marco Bubke
f0a86d4510 Revert "Merge remote-tracking branch 'origin/4.15'" 
This reverts commit 888ca0dd20.

Reason for revert: wrong patchset

Change-Id: I1291789938601aaf606c59917ff938e3c24c78dd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2021-05-06 15:30:02 +00:00
Tim Jenssen
888ca0dd20 Merge remote-tracking branch 'origin/4.15' 
Conflicts:
	src/libs/sqlite/sqlitebasestatement.h
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: I0fa0a8a7feffed24c0d2bc26eca86590f1156755
 2021-05-06 13:07:48 +02:00
Marco Bubke
1618937637 Sqlite: Use config.h instead of setting everything in the build files 
Change-Id: Ia70a5e78475a8b8078276df03330060c8785bf90
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2021-05-05 15:14:49 +00:00
Eike Ziller
f4c3c49920 Bump version to 4.15.1 
Change-Id: Ibc2b495f00d33ec9c0c1400c9378cd80d95e11f3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-05-05 14:48:35 +00:00
Eike Ziller
9f32c4aa2e Bump version to 4.15.0 
Change-Id: Idba4da565319c5b23e781f26fb1cf68722abbede
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-04-14 09:54:10 +00:00
Eike Ziller
a0d3d89e3f Bump version to 5.0 beta1 
Since we almost always do incremental changes instead of major overhauls
in one go, it doesn't make sense to couple changes in the major release
number to major feature overhauls (which is why we've stayed at "4"
since a few years now).

Switch to a version scheme more like semantic versioning. So next
feature release is 5.0, and the following feature-release after 5.0 will
be 6.0, and so on. After all we do break public API in these releases.

Fixes: QTCREATORBUG-25486
Change-Id: Id8510dd75077386e59c537a0c9768f27120a998a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
 2021-03-26 08:20:28 +00:00
Eike Ziller
2b521506f3 Bump version to 4.15.0-rc1 
Change-Id: I522a8c88d636bcc09de2be0b2aa4f47a1c080ac9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-03-25 11:15:10 +00:00
Eike Ziller
2bcc33e010 Bump version to 4.15 beta2 
Change-Id: I29436ee542d1f35e8117d670ea5cadd172432b94
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-03-16 14:40:20 +00:00
Eike Ziller
bce64778c5 Merge remote-tracking branch 'origin/4.15' 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qtcreator_ide_branding.pri

Change-Id: I009308451e1c6276692412f498125d79a8f12a07
 2021-03-11 14:10:14 +01:00
Eike Ziller
e2b0547519 Merge remote-tracking branch 'origin/4.14' into 4.15 
Conflicts:
	qtcreator_ide_branding.pri

Change-Id: I9d9beb7b842800ac37bc628695fb01dc91923eb9
 2021-03-11 14:00:57 +01:00
Alessandro Portale
ac5bffc1e4 More bumping of the Copyright Year to 2021 
Also for the qmake and qbs based build systems.
Amends: 0af4f5152e

Change-Id: Ifcf1730d7b2b28dd9582d5b3569f50e3b7c91e07
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-03-11 08:48:12 +00:00
Eike Ziller
28d6be9867 Bump version to 4.16.0-beta1 
Change-Id: I5fda5f867273d27c41b8d07371b0bd01e8e851dd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-02-24 18:55:05 +00:00
Eike Ziller
fc5af03862 Bump version to 4.14.2 
Change-Id: I792587c71eadf0b2602d73e7fa4be324cc2766cf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-02-24 18:51:04 +00:00
Christian Kandeler
7d4a632cb2 qbs build: Remove code for creating deployment packages 
Not a use case anymore, and if it were, we'd do it using built-in
capabilities.

Change-Id: I4c588ad7fb282530880210cb4c5795677074b1e0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2021-02-17 16:11:49 +00:00
Eike Ziller
ea4a53a1aa Bump version to 4.14.1 
Change-Id: I0391715109a6ac43da4b3b744a845cf914b0d0b2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2020-12-17 14:15:59 +00:00
Christian Kandeler
3e2d224722 clang: Support user-provided llvm-config 
... in the qmake and qbs builds. (The look-up mechanism in the cmake
build is completely different.)

Fixes: QTCREATORBUG-20592
Change-Id: I049740795108060aeada62dd030e82390e07fe48
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2020-12-15 14:56:07 +00:00
Orgad Shaneh
c1a0e9d638 Bump version to 4.15 beta 
Change-Id: I39f45b880649323f71ebf3bd3a6bb3677ca33fd2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2020-12-08 10:19:36 +00:00
Eike Ziller
ed23cecc44 Bump version to 4.14.0 
Change-Id: I419bf8e73519be8f796dbf4399ebebedf3d74ffb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2020-12-03 14:21:43 +00:00
Eike Ziller
471892deb0 Bump version to 4.14.0-rc1 
Change-Id: Ifcb361437d1cac7d69e871a980a1824dc94b4c22
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2020-11-24 14:25:44 +00:00
Christian Kandeler
baaccc87ba clang support: Adapt some version checks in qmake/qbs files 
Change-Id: Ic1ea0e10586c5ab33f7fad87f76d742e13a55834
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2020-11-24 12:16:47 +00:00
Eike Ziller
d5d5068009 Bump version to 4.14 beta2 
Change-Id: Ife5666e272697da19e1ba1a96d93281943deb37e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2020-10-29 10:24:08 +00:00
Christian Kandeler
d65ef60ea2 clang: Fix include/resource dir confusion 
The getClangResourceDirAndVersion() function in ClangTools could return
the actual resource dir or the include dir, depending on the input. This
mistake happened because of misleading names spread all around the code.
Now the function returns what it says, and the other names are accurate
as well.

Change-Id: I0a8600857ee7b9fafb16256e0d1ad203ac3273d2
Reviewed-by: David Schulz <david.schulz@qt.io>
 2020-08-24 10:18:30 +00:00
hjk
52b2ca55c9 Replace QT_USE_FAST_{OPERATOR_PLUS,CONCATENTION} by QT_USE_QSTRINGBUILDER 
QT_USE_FAST_CONCATENATION doesn't do anything nowadays.

Using QT_USE_QSTRINGBUILDER is the same as QT_USE_FAST_OPERATOR_PLUS
for QStrings and enables more QStringBuilder use for QByteArrays.

Change-Id: Ibd297817c50d86661d47822799f989447249af1b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2020-08-07 12:45:03 +00:00
Christian Kandeler
e34ff64196 qbs build: Add convenience properties for sanitizers 
Change-Id: I8c0908ed482127712c1cf4052d7b792be5ba79ae
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2020-07-27 13:56:34 +00:00
Eike Ziller
f4bc5df89e Bump version to 4.14 beta 
Change-Id: I299dfae2c9422c1f02c3357109d426beaadbec7e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2020-07-01 08:32:35 +00:00
Christian Kandeler
0861ba2fc9 sqlite: Fix qbs build 
Exporting the full sqlite interface can lead to run-time conflicts with
the system sqlite that Qt's SQL support pulls in.
So re-build the sources for the unit test, as in the qmake build.

Change-Id: I8394b9c0aa4e21704bc84600f40b8f5d706ad66d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2020-06-16 12:43:00 +00:00
Eike Ziller
8dff37f0d3 Disable ClangRefactoring by default 
It is too unstable even for experimental status.

Change-Id: I38e483eaece00aec0211a81414c6c5a000bf283f
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2020-06-02 13:32:14 +00:00
Christian Kandeler
a03113832b qbs build: Make clang plugins build with libclang-cpp 
Change-Id: Ifbae5f2a124e5c36126391d48b0a186bd153d678
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
 2020-05-26 13:09:07 +00:00
Eike Ziller
227904d4a6 Merge remote-tracking branch 'origin/4.12' 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ic39945a0e3e140a9467b4b4f572929257ff3a324
 2020-05-26 09:00:05 +02:00
Nikolai Kosjar
f6210b3569 qbs build: Clang: Adapt llvm-config variants to check for 
Change-Id: Ib961efe9b72acdfc383cade2053a4a1126e99132
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2020-05-22 13:21:44 +00:00
Eike Ziller
146d3dc7e3 Bump version to 4.12.2 
Change-Id: I734d8571ab672cbbccaebe6d3d1a97cd15f31831
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2020-05-22 08:13:13 +00:00
Eike Ziller
52b7ec058b Merge remote-tracking branch 'origin/4.12' 
Conflicts:
	src/plugins/mcusupport/mcusupportsdk.cpp

Change-Id: I1583fa81adc0218ad4657baa347c08e9e29f88e6
 2020-05-15 14:49:11 +02:00
Christian Kandeler
050dec20dd qbs build: Fix excessive clang 10 warnings for qbs submodule 
Change-Id: Ie1bb9833e00412d753b32c8267a9e9413aa66a7d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2020-05-11 09:33:01 +00:00
Eike Ziller
bf490b62e0 Merge remote-tracking branch 'origin/4.12' 
Change-Id: I11936ad9e4515c3c6c9df1d949cc8116aeccd4c4
 2020-05-06 09:43:20 +02:00
Christian Kandeler
bab97bf9b6 qbs build: Disable clang tooling plugins for llvm >= 10 
They won't build with the new version.

Change-Id: I77c94817290418b0a97222465f0f8a8660053fae
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2020-05-05 15:32:23 +00:00
Eike Ziller
106e0430ed Bump version 
Change-Id: Ieb662d20d5bba2e410039bcdeb2459129601187a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2020-04-28 06:11:58 +00:00
Eike Ziller
76617a5512 Bump version -> 4.12.0 
Change-Id: I6894b5b095393981d9d42569ad43024e40711f94
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2020-04-08 08:28:40 +00:00
Eike Ziller
af29767857 Bump master->4.13.0-beta1 
Change-Id: Ia25db16341e45f75c893c21c159775fd3428b538
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2020-03-20 07:21:45 +00:00
Eike Ziller
c6e03959d8 Bump version 
Change-Id: I1139e1c10311fda9f46367dcb397fa674050f7da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2020-03-19 16:26:44 +00:00
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