summaryrefslogtreecommitdiff
path: root/qtcreator_ide_branding.pri
Commit message (Collapse)AuthorAgeFilesLines
* Remove unneeded .pro/.pri filesEike Ziller2022-12-201-17/+0
| | | | | | | | | | Remove qtcreator(_ide_branding).pri, and all remaining .pro/.pri files that depend on it. They have CMake files now. Change-Id: I87d100b49df7ca95694a755cb581cb5eea26aa9a Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Merge remote-tracking branch 'origin/qds/dev'Tim Jenssen2022-12-141-0/+1
|\ | | | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturesmodel.cpp Change-Id: Ieda6242b845387100022b08251283891fb0fbda7
| * Bump version to 9.0.1Eike Ziller2022-11-241-2/+2
| | | | | | | | | | Change-Id: Iaa42623df5a1b35833cb1f9e0cfc3187b580e34b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version to 9.0.0Eike Ziller2022-11-111-3/+3
| | | | | | | | | | Change-Id: I9975d78fc4d9f263702e7f031083ab4847269fc3 Reviewed-by: David Schulz <david.schulz@qt.io>
| * Bump version to 9.0.0-rc1David Schulz2022-10-261-3/+3
| | | | | | | | | | Change-Id: If9f046539e70e8aba9af367472b76bac853198b8 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Bump version to 9.0.0-beta2Eike Ziller2022-10-131-3/+3
| | | | | | | | | | | | Change-Id: I2ad221b1f6eef849220de2870ac2219e5c008279 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | Bump version to 10.0.0-beta1Eike Ziller2022-10-051-3/+3
|/ | | | | Change-Id: Ieb90096775fecfb4bfe1228372a1a3b0d9512faf Reviewed-by: David Schulz <david.schulz@qt.io>
* Bump version to 9.0.0-beta1Eike Ziller2022-07-081-3/+3
| | | | | Change-Id: If64527bc1f5af72f488a96bb134e70a4194515af Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 8.0.0Eike Ziller2022-07-071-3/+3
| | | | | Change-Id: Ibf884cf0128e6e24e09c0b04e20a4a8ba26313d7 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 8.0.0-rc1Eike Ziller2022-06-291-3/+3
| | | | | Change-Id: I6784f126f9492a7968027f5edb995c94cc097ca3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 8.0.0-beta2Eike Ziller2022-06-171-3/+3
| | | | | Change-Id: I02a09e916d11c7ce28b2d58ba7517e582e14be06 Reviewed-by: David Schulz <david.schulz@qt.io>
* Bump version to 8.0 betaEike Ziller2022-02-111-3/+3
| | | | | Change-Id: I03a99d3b134a2116eb12e6d4e98b994d684f133c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/6.0'Eike Ziller2022-01-191-1/+1
|\ | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri Change-Id: I04ea68c9e20dc331b1f12b77c8b6f6b4db38c836
| * Update copyright yearEike Ziller2022-01-191-1/+1
| | | | | | | | | | Change-Id: I42049e2b3a78ee3968e3df7dfea229c3927c3a75 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version to 6.0.3Eike Ziller2022-01-191-2/+2
| | | | | | | | | | Change-Id: I77600bb39157c7c228e1fd0aee86c4f3ec9e7e65 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version to 6.0.2Eike Ziller2021-12-171-2/+2
| | | | | | | | | | Change-Id: I4e6fcbded04028bf20433984f0679fafa54da310 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version to 6.0.1Eike Ziller2021-12-021-2/+2
| | | | | | | | | | Change-Id: Idc7519d7b74968cb6bdb473ff3dabff18ad0cee5 Reviewed-by: David Schulz <david.schulz@qt.io>
| * Bump version to 6.0.0Eike Ziller2021-11-111-3/+3
| | | | | | | | | | Change-Id: I68af70325909705107b2e880011c72d0b75000ae Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version to 6.0-rc1Eike Ziller2021-10-281-3/+3
| | | | | | | | | | Change-Id: I08fc4a48ad6089e4477230824317ae0f1bd408e5 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version to 6.0.0-beta2Eike Ziller2021-10-141-3/+3
| | | | | | | | | | Change-Id: If15ba5f3b6484a7b649baac5bd0eb25147cc10db Reviewed-by: David Schulz <david.schulz@qt.io>
* | Bump version to 7.0Eike Ziller2021-10-081-3/+3
|/ | | | | Change-Id: Icc31b9c768480885593794b59a1997c352ad774c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 6.0 betaEike Ziller2021-06-291-3/+3
| | | | | Change-Id: I945c2bc0f400191efdfd37523a66ffedee0deb09 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 5.0 beta1Eike Ziller2021-03-261-3/+3
| | | | | | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/4.15'Eike Ziller2021-03-111-1/+1
|\ | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qtcreator_ide_branding.pri Change-Id: I009308451e1c6276692412f498125d79a8f12a07
| * Merge remote-tracking branch 'origin/4.14' into 4.15Eike Ziller2021-03-111-1/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: qtcreator_ide_branding.pri Change-Id: I9d9beb7b842800ac37bc628695fb01dc91923eb9
| | * More bumping of the Copyright Year to 2021Alessandro Portale2021-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Also for the qmake and qbs based build systems. Amends: 0af4f5152e7918d7e02823259482fe45b2c9c8f0 Change-Id: Ifcf1730d7b2b28dd9582d5b3569f50e3b7c91e07 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| | * Bump version to 4.14.2Eike Ziller2021-02-241-2/+2
| | | | | | | | | | | | | | | Change-Id: I792587c71eadf0b2602d73e7fa4be324cc2766cf Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| | * Bump version to 4.14.1Eike Ziller2020-12-171-2/+2
| | | | | | | | | | | | | | | Change-Id: I0391715109a6ac43da4b3b744a845cf914b0d0b2 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | Bump version to 4.16.0-beta1Eike Ziller2021-02-241-3/+3
|/ / | | | | | | | | Change-Id: I5fda5f867273d27c41b8d07371b0bd01e8e851dd Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Bump version to 4.15 betaOrgad Shaneh2020-12-081-3/+3
|/ | | | | Change-Id: I39f45b880649323f71ebf3bd3a6bb3677ca33fd2 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 4.14.0Eike Ziller2020-12-031-3/+3
| | | | | Change-Id: I419bf8e73519be8f796dbf4399ebebedf3d74ffb Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 4.14.0-rc1Eike Ziller2020-11-241-3/+3
| | | | | Change-Id: Ifcb361437d1cac7d69e871a980a1824dc94b4c22 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 4.14 beta2Eike Ziller2020-10-291-3/+3
| | | | | Change-Id: Ife5666e272697da19e1ba1a96d93281943deb37e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 4.14 betaEike Ziller2020-07-011-3/+3
| | | | | Change-Id: I299dfae2c9422c1f02c3357109d426beaadbec7e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Packaging: Get rid of binary-artifacts repository usageEike Ziller2020-05-261-1/+0
| | | | | | | | | | 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>
* Bump master->4.13.0-beta1Eike Ziller2020-03-201-4/+4
| | | | | Change-Id: Ia25db16341e45f75c893c21c159775fd3428b538 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump versionEike Ziller2020-03-191-4/+4
| | | | | Change-Id: I1139e1c10311fda9f46367dcb397fa674050f7da Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version -> 4.12 beta2Eike Ziller2020-03-061-3/+3
| | | | | Change-Id: I9da6834efe5d1423dc3d5a47d9472c50dc26d44c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Make documentation part of brandingEike Ziller2020-02-191-0/+5
| | | | | | | | So Design Studio can build different documentation than Qt Creator Change-Id: I078df39d36533a1659caac937ef869e4bf0c7a43 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Merge remote-tracking branch 'origin/4.11'Eike Ziller2020-02-071-1/+1
|\ | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri Change-Id: I4e339410b17df4098f17e3bb621e1c02e3f8026b
| * Bump version to 4.11.2 and copyright year to 2020Eike Ziller2020-02-061-3/+3
| | | | | | | | | | Change-Id: I8e97c8f3e38dd1a6fe64e47cd30d73d3d5622425 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Version bump to 4.11.1Eike Ziller2019-12-161-2/+2
| | | | | | | | | | Change-Id: I31c53f92acd02c380e44ecea534b178a3fb5458c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version to 4.11.0Eike Ziller2019-11-291-3/+3
| | | | | | | | | | Change-Id: I167a84606f707529e21c208d019241ed8d7c0ce0 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Update version to 4.12 betaEike Ziller2019-12-061-4/+4
|/ | | | | Change-Id: I13641e62b01b126493be852e5db3ef76044918f7 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version -> 4.11.0-rc1Eike Ziller2019-11-041-3/+3
| | | | | Change-Id: I495bd3961c718a2090ac1999f56c195e95cd53b1 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version -> 4.11 beta2Eike Ziller2019-10-211-4/+4
| | | | | Change-Id: Iea7b87cc19309eb4c3a921fa29d1b40170aaacc8 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.10'Eike Ziller2019-06-211-3/+3
|\ | | | | | | Change-Id: I452d5cbf27c1a0d43a890cef74cb8f0b9646bf60
| * Bump versionEike Ziller2019-06-201-4/+4
|/ | | | | Change-Id: I5d2298e71837e3c146196f75a9bd1472771f1949 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* add brand QtCreator to something else featureTim Jenssen2019-05-021-0/+12
- this patch enables branding QtCreator to something else excluding the logo icons which will follow in a later patch - qtcreator_ide_branding.pri is always included, so only need to write the values we want to override in a IDE_BRANDING_PRI file - if there is no BINARY_ARTIFACTS_BRANCH it won't checkout that repository Task-number: QTCREATORBUG-22226 Change-Id: I592b40025cc53988224770b704622874f2174593 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
View Lorry Controller Status