feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
65,264 Commits 108 Branches 368 Tags
e65e4b81ea1c84355f649d9eac885ba1acb51c06
Commit Graph

28 Commits

Author SHA1 Message Date
Eike Ziller
666cdd754c Bump version to 4.13.1 
Change-Id: I94246bd22b4868f5c99f334d1360c88ea136d24c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2020-08-26 13:23:30 +00:00
Eike Ziller
e9f74df8cf Bump version to 4.13.0 
Change-Id: Id1d2ebca1c2bca86683a3172bfe2f95123e1b897
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2020-08-14 10:06:21 +00:00
Eike Ziller
9dd28206cd Bump version to 4.13.0-rc1 
Change-Id: Icc4b98903a16d05d978ad27c2aeffac8dbf22227
Reviewed-by: David Schulz <david.schulz@qt.io>
 2020-07-27 08:40:11 +00:00
Eike Ziller
eac46f7f24 Bump version to 4.13 beta2 
Change-Id: I836987b4c4e28c65cb67c2efba595ed92d071b6a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2020-07-14 07:54:02 +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