aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/13.0'HEADmasterEike Ziller2024-02-291-0/+3
|\ | | | | | | Change-Id: Id051f40a93162b399089b7729bd51adc5021d6b0
| * Don't try to build documentation for extra-cmake-modulesv13.0.0-rc1v13.0.0-beta2v13.0.013.0Eike Ziller2024-02-191-0/+3
|/ | | | | | | | We don't need the documentation, so avoid issues with it by not even trying. Change-Id: Iaa147da25b75c6e2127259ce53df128be604a842 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Merge remote-tracking branch 'origin/qds/dev'v13.0.0-beta1Tim Jenssen2024-01-191-5/+9
|\ | | | | | | Change-Id: I5ce4417e0fc8fedb855c7374eb6283464dc8500d
| * fix universal builds x86_64;arm64 builds on macOSqds/4.4Tim Jenssen2024-01-191-5/+9
| | | | | | | | | | | | Task-number: QDS-11156 Change-Id: If31d30ce312346ee8bc28af9c51881c1e203d82d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | adjust to qtcreator changesTim Jenssen2023-12-141-2/+3
| | | | | | | | | | Change-Id: I221ad688fe234053e108038d518659e245a61b29 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/qds/dev'Tim Jenssen2023-12-1411-226/+81
|\| | | | | | | Change-Id: Ic3ca8db5ffbf330b2b3754e78ff04c8d9373b8fc
| * qds: fix super repository developer buildsTim Jenßen2023-11-031-0/+4
| | | | | | | | | | Change-Id: I676b30f60fe6671657028a69d3edda25e0197745 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * Merge remote-tracking branch 'origin/12.0' into qds/devTim Jenßen2023-11-038-32/+41
| |\ | | | | | | | | | Change-Id: Ie3a23f48678f39cbc0d1f101983ec345142bdb16
| * | QmlDesigner: Change cadence to one day and submit on shutdownThomas Hartmann2023-07-181-1/+7
| | | | | | | | | | | | | | | | | | Task-number: QDS-10201 Change-Id: Ib9889685af9d0dcfacaabc43eeee4cf8f3991111 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * | Merge "Merge remote-tracking branch 'origin/11.0' into qds/dev" into qds/devThe Qt Project2023-06-060-0/+0
| |\ \
| | * \ Merge remote-tracking branch 'origin/11.0' into qds/devTim Jenßen2023-06-065-25/+33
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I4a545cb291b3c00fa35bcd5d2585bf3550606121
| * | \ \ Merge remote-tracking branch 'origin/11.0' into qds/devTim Jenßen2023-06-066-34/+44
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Ib9889685af9d0dcfacaabc43efe54cf8f399a331
| * | | | | QmlDesigner: Add tracking of duration between eventsThomas Hartmann2023-06-022-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QDS-9961 Change-Id: I5c96666faecbd8b6660923655483c870a2f40666 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * | | | | On first start submit the data once after 10 minutesThomas Hartmann2023-05-252-1/+15
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to collect the data for first time users that never come back. Change-Id: I5c96660faecbd8b68e0923655483c870a2f408b5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * | | | Set m_feedbackPoppedData to true before we launch dialogThomas Hartmann2023-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case anything goes wrong with the launch, this should ensure the launch is not triggered again. Change-Id: Ic623b83bbabf1e06662f2eceb92a2c2466475777 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * | | | Do not show feedback dialog if telemetry is disabledThomas Hartmann2023-01-203-17/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QmlDesignerUsageEventSource is active even if telemetry is disabled. Therefore we have to explcitly check this. Removing some leftovers. Task-number: QDS-8824 Change-Id: Ic623b83bbabf1e066f2f2eceb92a2c2466475677 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | | | Call the feedback dialog from the QmlDesignerThomas Hartmann2023-01-168-210/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes maintenance of the UI simpler. Removing the QML UI from usagestatistics. Change-Id: Ic623b83bbabf1e0bbf2f2eceb92a2c2466475666 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * | | | Merge remote-tracking branch 'origin/9.0' into qds/devTim Jenssen2023-01-128-23/+186
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Ic623b83bbabf1e0bbf2f2eceb92a2c24754756a8
* | | | | | Update to upstream changeEike Ziller2023-12-112-23/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (T|t)oolChain most became (T|t)oolchain Change-Id: I4623a90a2ee3ffc5b0c7662f14552fc8cc63019a Reviewed-by: hjk <hjk@qt.io>
* | | | | | Merge remote-tracking branch 'origin/12.0'Eike Ziller2023-10-139-39/+51
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | | Change-Id: I1791df8fc94b80fb73ce609a659b23dbeef6310a
| * | | | Merge remote-tracking branch 'origin/11.0' into 12.0v12.0.1v12.0.0-rc1v12.0.0-beta2v12.0.0Eike Ziller2023-10-133-1/+3
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/datasources/buildsystemsource.cpp src/datasources/examplesdatasource.cpp Change-Id: I02f354c281aae91bfc71042e00003f492acf9f5c
| | * | | fix Session is in Core instead of ProjectExplorerv11.0.3v11.0.2v11.0.1v11.0.0-rc1v11.0.0-beta2v11.0.0-beta1v11.0.011.0Tim Jenßen2023-06-062-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I70f1e5bc3acf1c371b4cba673b13b214f91ff739 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| | * | | fix Core::IOptionsPage is not a QObject anymoreTim Jenßen2023-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I03c376abc21d37dbce588e629bf60541afb4db02 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| | * | | fix warningTim Jenßen2023-06-061-1/+1
| |/ / / |/| | | | | | | | | | | | | | | Change-Id: I6b5ecbb98ad7204bb2ac7ffd5d0015ac4c461158 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * | | Adapt to various upstream changesv12.0.0-beta1Eike Ziller2023-10-129-39/+49
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | - plugin json uses cmake style - app_version is replaced by Q(Core|Gui)Application properties - session moved to Core - settings pages are no QObjects anymore Change-Id: I36ee689e75f9db10c6de688f14559fb9d88d7381 Reviewed-by: hjk <hjk@qt.io>
* | | Adapt to upstream changes: Split of session and project managerEike Ziller2023-04-253-22/+30
| | | | | | | | | | | | | | | Change-Id: I3fb7b3c17d5116a405ff4fc93193b17c56ff3a7a Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* | | Fix build with Qt Creator master/11.0Eike Ziller2023-03-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The special FindQt5.cmake that allowed finding Qt 6 with find_package(Qt5...) is gone. Just look for Qt6 since we don't support building with Qt5 anymore, and use version-less targets, like we do in Qt Creator now. Change-Id: I66d0a08eb83a351e010d958d3ec1ed700a96f971 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | | Merge remote-tracking branch 'origin/9.0'v10.0.2v10.0.1v10.0.0-rc1v10.0.0-beta2v10.0.010.0Tim Jenssen2023-01-128-23/+186
|\ \ \ | | |/ | |/| | | | Change-Id: Ic36a033155d32e29da794e73db79fc305f516669
| * | Merge remote-tracking branch 'origin/8.0' into 9.09.0Tim Jenssen2023-01-128-23/+186
| |\ \ | | |/ | |/| | | | Change-Id: I76cb7279dc785b5ce5d886b1ca486607b5bd16c1
| | * Add ApplicationSource8.0Thomas Hartmann2022-10-264-3/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The KUserFeedback data sources do not include the application name. Since we have "Qt Design Studio" and "Qt Creator" this makes distinguishing the different applications easier. I added also the version for consistency and ease of use on the server side. Task-number: QDS-7821 Change-Id: I4b71f1ca8797e21bbbc8d1e2a1a21dac0b6d5eee Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| | * QmlDesigner: Fix telemetry popupThomas Hartmann2022-09-132-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | The import does not exist in Qt 5 and we changed the identifiers for the views. Change-Id: I76ebeaaff2c6798834bdd2d751fb971bb9253fff Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| | * Add toolchain abi and build success/failure per toolchainv8.0.1v8.0.0-beta2hjk2022-06-232-16/+74
| |/ | | | | | | | | Change-Id: I76ebeaaf72c6798834bdd2d751fb971bb9253f9d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* / Fix KUserFeedback README page URLAlessandro Portale2022-12-201-1/+1
|/ | | | | Change-Id: I5d54d36f7900fa4a5a5a1a8a6aeaaaba1aba3a05 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Merge remote-tracking branch 'origin/7.0'v9.0.1v9.0.0-beta2v9.0.0Eike Ziller2022-02-101-1/+1
|\ | | | | | | Change-Id: Ia1c75fddd0fce05fd735a7a2b2f3461e264e8302
| * Adapt to upstream changev7.0.0-rc1v7.0.0-beta2v7.0.0-beta1v7.0.0Eike Ziller2022-02-101-1/+1
|/ | | | | | | Adapt to 3749cfc89621236046dd7cbe89bc375a62bc0685 Change-Id: Icd668a10bb47944f7de2485f540785678643e552 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Prefer normalized SIGNAL/SLOT argumentsKai Köhne2022-01-191-6/+6
| | | | | Change-Id: I5ff1f669a7f7a84516bd54a26e4560751f69ca73 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Merge remote-tracking branch 'origin/6.0'Eike Ziller2021-10-257-9/+14
|\ | | | | | | Change-Id: Id26001e388f79e9cf69df47a82fd526fd4a639c7
| * Merge remote-tracking branch 'origin/5.0' into 6.0v6.0.2v6.0.1v6.0.0-rc1v6.0.0-beta2v6.0.0Eike Ziller2021-10-257-9/+14
|/| | | | | | | Change-Id: I4b71f1ca8797e21bbbc8d1e2a1a21dac0b6d59ec
| * Use IDE_DISPLAY_NAMEv5.0.3v5.0.2v5.0.1Thomas Hartmann2021-09-031-1/+4
| | | | | | | | | | | | Task-number: QDS-4220 Change-Id: Ic555d82c4ca85103d709ebed669a1170e9796032 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Fix not existing sha1 for kuserfeedback submodulev5.0.0-rc1v5.0.0Kai Köhne2021-08-031-0/+0
| | | | | | | | | | | | | | Amends b3f7ef9858425f Change-Id: I745188076a5378edd94ca2864f77162d50aa035f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * Update to latest kuserfeedbackKai Köhne2021-08-023-2/+2
| | | | | | | | | | | | | | | | This also adds support for Qt 6 Change-Id: I5eba2baa702c7e9c2d0cba1153a1cb9d343eb825 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * Qt 6: Simplify data type for examplesPathv5.0.0-beta1Kai Köhne2021-07-062-5/+7
| | | | | | | | | | | | | | | | | | | | | | Work around error C2039: 'toList': is not a member of 'QSet<QString>' by not using a QSet<> here. Change-Id: Ib444056f1665d0ce0a70c048ac82a86c16137497 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * Qt 6: Make string conversion explicitKai Köhne2021-07-061-1/+1
| | | | | | | | | | Change-Id: I14f396dabc5a7494f9ea1e311cd4f6ae49dabf71 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Add README.mdKai Köhne2021-08-031-0/+50
|/ | | | | Change-Id: Ie752f21883c4841c97f416cadb0eb68df3426026 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.15'Tim Jenssen2021-05-0412-5/+248
|\ | | | | | | Change-Id: Iea81d2d0f9a1676c63acbab0e0be6710c04f8e6f
| * Update kuserfeedback submodule to include privacy updatev4.15.2v4.15.1v4.15.04.15Alessandro Portale2021-04-221-0/+0
| | | | | | | | | | | | | | Fixes: QTCREATORBUG-24197 Change-Id: I3eee4bf44d6ded56a0d40e2726ea039b795bc169 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * QmlDesigner: Fix submit button on user feedback popupv4.15.0-rc1v4.15.0-beta2Miina Puuronen2021-03-181-11/+6
| | | | | | | | | | | | | | | | | | | | | | Submit button was previously always enabled, now it will stay disabled until user has tapped a rating star. Also made small improvements to the color definitions of buttons. Fixes: QDS-3971 Change-Id: I1e768112f124ba59c61a2ab98cbc3e7707a874d5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * Implement user feedback popupv4.15.0-beta1Miina Puuronen2021-03-0410-4/+250
| | | | | | | | | | | | | | Task-number: QDS-3500 Change-Id: I1a732b77de6d2bb411586b810c695cdfea01aa00 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * fix if building against a built qtcreatorTim Jenssen2021-02-261-0/+2
| | | | | | | | | | Change-Id: Ia5c39a0ed5127091d26f35cfb47db01310a6e853 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * telemetry: Make sure to depend on the QtCreator dependenciesCristian Adam2021-02-261-1/+1
|/ | | | | | | | | | | | The plugin is being built using ExternalProject_Add, which means that it will use QtCreator targets from the exported QtCreator build. The trigger of the build is done from a super build including QtCreator. Adding the QtCreator dependencies makes sure that the binaries referenced from the exported build are first created. Change-Id: I0bc4ea85170bf4beed869ef2205828e7fbc9b1a8 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 12:56:22 +0000