feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
70,590 Commits 108 Branches 368 Tags
e860871d2a6984a89f443928dfee5dbfa84d40cf
Commit Graph

46 Commits

Author SHA1 Message Date
Eike Ziller
3d4d7c7e14 Merge remote-tracking branch 'origin/5.0' 
Conflicts:
	src/plugins/clangtools/clangtoolssettings.cpp
	src/plugins/clangtools/executableinfo.cpp
	src/plugins/clangtools/executableinfo.h

Change-Id: Id8caf63e3e594792467d3447870086bd2d8f73b9
 2021-09-13 17:03:55 +02:00
Eike Ziller
6528bd6a27 Add branding option for application icon and logo 
Change-Id: I23ee91ab47d06aab370b2083d4f96f7833bf16ff
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2021-09-08 06:29:51 +00:00
Eike Ziller
28f1519182 Bump version to 5.0.1 
Change-Id: Ic4daa60f1cb55a15a6885292cf2928910ae3f563
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-08-27 12:26:49 +00:00
Eike Ziller
1dd0511b49 Bump version to 5.0.0 
Change-Id: I1203dd71cc2f1e6d1f435dbfdc07376130fbb61f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-08-13 07:25:12 +00:00
Eike Ziller
67d85d1592 Bump version to 5.0 RC1 
Skipping Beta 2 due to summer slothfulness.

Change-Id: If3ee6c1c218b17d413d2f28023b9fb094a969cdd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-07-16 09:31:23 +00:00
Eike Ziller
f6290d52f5 Bump version to 5.0 beta2 
Change-Id: Ie8a9f5be343d5aa939b9ec54e549c604d05d223f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-07-12 09:41:54 +00:00
Eike Ziller
1d05a2b5af Merge remote-tracking branch 'origin/5.0' 
Change-Id: Icea9215204a7247c5fbbc818833132676a3b9e11
 2021-07-06 16:00:14 +02:00
Orgad Shaneh
dcf692d3ff CMake build: Purge copying settings from Nokia directory 
It is not used, and not supported in the other build systems.

Change-Id: I38049e145595490058e255b94cdb8dd13c3f6fb2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-07-05 14:36:25 +00:00
Eike Ziller
2bfcc3739f Bump version to 6.0 beta 
Change-Id: I945c2bc0f400191efdfd37523a66ffedee0deb09
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-06-29 11:06:38 +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
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
b6164e7b72 Merge remote-tracking branch 'origin/4.14' into 4.15 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake

Change-Id: I70c4cc83197f089e5d92303a6d434fe28d63a187
 2021-03-10 17:41:34 +01:00
Alessandro Portale
0af4f5152e Bump IDE_COPYRIGHT_YEAR to 2021 
Change-Id: Iadb0f2618b02cd9f36366d718d50be7efcb5f679
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-03-10 16:38:32 +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
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
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
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
Eike Ziller
240fba0222 cmake build: Allow branding to change documentation file 
Task-number: QTCREATORBUG-22488
Change-Id: I80a1feafa7b027dc99acdb019359037ae0259573
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
 2020-10-28 08:53:23 +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
Eike Ziller
63df649655 Packaging: Get rid of binary-artifacts repository usage 
We removed the cdbextension and wininterrupt binaries from there a long time
ago, and instead package these for the installer. Package newest jom version
from its actual release in the installer as well.

Task-number: QTCREATORBUG-23908
Change-Id: Ic9bdc97774cbeb894fc261e57af127d6cdc71205
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
 2020-05-26 06:35:45 +00:00
Eike Ziller
deb0eaf795 Merge remote-tracking branch 'origin/4.12' 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp

Change-Id: I34c3d1fd5be90537e37d15e00b1a0d455d1bf81d
 2020-04-14 09:47:38 +02: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
Alessandro Portale
8228d43579 Core: Turn the IDE revision link in VersionDialog to be Opt-in 
If IDE_REVISION is set, don't default to some hardcoded string
for IDE_REVISION_IDE_STR.

Task-number: QTCREATORBUG-23524
Change-Id: Icc6aa6a4a0fb24178c5c1bd5feaa96b6a5b07115
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2020-02-10 07:56:18 +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
Alessandro Portale
28ce199217 Core: Let the clickable link in VersionDialog jump to git log 
...instead to just one commit.

Change-Id: I8bb53ba3e7f4fcfb2fb306afe2a06a2b63dc89d8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
 2020-01-24 17:20:05 +00:00
Alessandro Portale
0d991985d6 Core: Fix non-CMake compilation with IDE_REVISION 
amends ae9fbd04dd

Change-Id: I746a89b21ee07aecad525b7b91fe1f360ad1e853
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2020-01-24 13:44:52 +00:00
Alessandro Portale
ae9fbd04dd Core: Make the revision sha in VersionDialog a clickable link 
The base URL can be defined via the IDE branding mechanism. If omitted,
the revision is plain text, like before this change.

Change-Id: If1a74707a10c76e15d3d25b8e6b0c302219fb91d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2020-01-23 14:33:31 +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
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
Cristian Adam
7651ba50fc CMake Build: Add IDE_COPYRIGHT_YEAR 
The About dialog was looking weird: "Copyright 2008 - "

Change-Id: I74b7117f6abce831adc3fd66042b777dbcfd1b67
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2019-10-04 10:18:18 +00:00
Eike Ziller
8df0653bf8 Merge remote-tracking branch 'origin/4.10' 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp

Change-Id: Iffdf48e782a734107ea170ebb3812e997cea0e7b
 2019-09-12 09:08:04 +02:00
Eike Ziller
f1e3484cd7 Bump version 
Change-Id: Id326cb47ae86be52016850455eeac20a6fcfc4a0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2019-09-09 08:57:03 +00:00
Eike Ziller
652a84e14a Bump version -> 4.10.0 
Change-Id: I2f5dfc47978514a6377db63705a703ce16f20499
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2019-08-05 07:00:49 +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
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
f4acc2f162 CMake build: Allow branding 
Create your own QtCreatorIDEBranding.cmake somewhere and point cmake to
it via CMAKE_MODULE_PATH

Task-number: QTCREATORBUG-22488
Change-Id: Ic1057d879c5104b57e4ed8ef8a9c4fc8d4140de9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2019-06-21 13:30:04 +00:00