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
