aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Merge remote-tracking branch 'origin/4.14'Eike Ziller2021-02-231-0/+3
|\ | | | | | | Change-Id: I9cbd7a96083899497a15b084c76c6e3a7470557a
| * Always build telemetry pluginv4.14.2v4.14.14.14Kai Köhne2021-02-111-0/+1
| | | | | | | | | | | | | | | | Make sure the plugin is build not only the first time, but on each build run. Change-Id: Ie1035b72fdd9da8cc720c2d811c2734f15ec908d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Forward QTC_MERGE_BINARY_DIR to subprojectsKai Köhne2021-02-101-0/+2
| | | | | | | | | | Change-Id: Ie6b3aef8cdc59f29450aa773751e9994264e46e8 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.14' into masterTim Jenssen2021-01-205-0/+192
|\| | | | | | | Change-Id: I05112655ff5b57c4c5d56dbe19e5d641444071ea
| * Add QmlDesignerUsageEventSourcev4.14.0-rc1v4.14.0Thomas Hartmann2020-11-255-0/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows collecting 'trace points' created by emitting QmlDesignerPlugin::handleUsageStatisticsNotifier(). Example of the data layout: { "qmlDesignerEvents": { "Action Executed AnchorsFill": 1, "Action Executed AnchorsReset": 1, "Action Executed LivePreview": 5, "Action Executed ResetPosition": 2, "Action Executed SELECTION": 1, "Action Executed ToBack": 1, "Action Executed ToFront": 2, "State Added": 14, "Timeline Added": 1 }, "qmlDesignerTimes": { "Form Editor": 19282, "Timeline": 8286 } } Change-Id: I734067ed01f46c12035ef54fb2b567341745a940 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | Merge remote-tracking branch 'origin/4.14'Eike Ziller2020-11-161-1/+1
|\| | | | | | | Change-Id: Id4a8d4eecdda6e62f427befe65d1b92dfd283d6e
| * CMake Build: Increase cmake minimum version to 3.10v4.14.0-beta2Eike Ziller2020-11-161-1/+1
|/ | | | | | | This fixes problems with PCH and AUTOMOC with policy CMP0071 Change-Id: I0772c3e274c49871a6c1214fa4825478ffe433d8 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Fix after removal of Core::Idv4.14.0-beta1Eike Ziller2020-10-053-4/+4
| | | | | Change-Id: Ia6904c6f67ce0780bd8fdf520e85d17656062f02 Reviewed-by: hjk <hjk@qt.io>
* Copy clang-format from Qt CreatorKai Koehne2020-09-241-0/+101
| | | | | Change-Id: I9a39cd5d41b976abf51254080c5e383942fc0937 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Use C++17 like Qt CreatorEike Ziller2020-08-101-1/+1
| | | | | Change-Id: I193c1c10ac25923ecad2fd763ba1c3e6b5041699 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Adapt to upstream changev4.13.3v4.13.2v4.13.1v4.13.0-rc1v4.13.0-beta1v4.13.04.13Eike Ziller2020-06-191-3/+3
| | | | | | | InfoBar moved to Utils in 7c5ed6f7d99362af743f30916d031d441abc1984 Change-Id: I72d3ae989c422a0e3160fb5b756af16ef02ce961 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-04-281-1/+1
|\ | | | | | | Change-Id: I9582c943d55d7dde82b642e6658d220f7fcfc0c6
| * Merge remote-tracking branch 'origin/4.11' into 4.12Eike Ziller2020-04-281-1/+1
|/| | | | | | | Change-Id: I421dd5b7770c7125aea9bbc4080eb99e5df63c31
| * Declare data collection pseudonymous instead of anonymousv4.11.2v4.11.14.11Alessandro Portale2020-01-281-1/+1
| | | | | | | | | | | | | | | | | | Since a883a60 it is not anonymous anymore, because a uuid is created and shipped with each data package. Task-number: QTCREATORBUG-23310 Change-Id: I97169c6c70069469966879ce4210d417eeae19dd Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
* | Merge remote-tracking branch 'origin/4.11'v4.12.0-rc1v4.12.0-beta2v4.12.0-beta1v4.12.0Eike Ziller2020-01-202-0/+4
|\| | | | | | | Change-Id: I174b668b91a6b3b837a7d893f766bf6947dba16f
| * Add .tag file for COINEike Ziller2020-01-162-0/+4
| | | | | | | | | | | | | | When COIN retrieves sources, it writes the commit SHA there Change-Id: Ief79bf50bfba74d5b191fc41d5d3e23de083cf91 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* | Merge remote-tracking branch 'origin/4.11'Eike Ziller2019-12-0613-415/+173
|\| | | | | | | Change-Id: If40f5b353999e0c3910c9c6b5ccc3dccd79404ec
| * Fix cmake buildv4.11.0Kai Koehne2019-12-051-2/+1
| | | | | | | | | | | | | | | | Amends 2947b9571f1009d39305a84720bf64a4ab6b3c46, a883a60069fedb05413e92a13b98aa24489a8c83 Change-Id: I107713601a36babc035e1b2e355442001ece4d89 Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
| * Fix designer extensionKai Koehne2019-12-031-1/+1
| | | | | | | | | | Change-Id: I70361df6a809c1a8950ed0612df35a50b6c00eb0 Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
| * Fix compile errorKai Koehne2019-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | Fixes src/datasources/qmldesignerusagetimesource.cpp:79:32: error: variable ‘const QSet<QString> validExtentions’ has initializer but incomplete type Besides this, QSet is overkill for 2 items. Change-Id: Ie8279e7144e6f30011e173f5928fefed8204d5ed Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
| * Use InfoBar to show encouragement messageVitaly Fanaskov2019-11-288-418/+39
| | | | | | | | | | | | Fixes: QTCREATORBUG-23271 Change-Id: Ia0f9ef8958ce5945b176c93248826d9c86873850 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * Show encouragement message on first startVitaly Fanaskov2019-11-282-1/+35
| | | | | | | | | | | | Fixes: QTCREATORBUG-23272 Change-Id: Ia2963d86a8163e429ead891e6dd7654ec992b5d8 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * Support building with CMakev4.11.0-rc1Kai Koehne2019-11-264-0/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a meta-build that builds & installs extra-cmake-modules and kuserfeedback, and finally src. Note that the meta-build uses ExternalProject_Add, which means that any CMake variables have to be passed explicitly to the sub-projects. The new git submodule extra-cmake-modules allow us to use an unchanged version of kuserfeedback/CMakeLists.txt A typical call might look like this: export CMAKE_PREFIX_PATH=$QTDIR;$CREATOR_BUILD_DR cmake -DUSP_AUTH_KEY="..." -DUSP_SERVER_URL="..." -DCMAKE_INSTALL_PREFIX=$CREATOR_INSTALL_DIR Change-Id: I4cc7b6936cad119156f19474c57045296ff6704e Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
* | Merge remote-tracking branch 'origin/4.11'Eike Ziller2019-11-1144-18/+255
|\| | | | | | | Change-Id: Ic877e309ac43be18d35d84214a4eb6795342b46c
| * Merge remote-tracking branch 'origin/4.10' into 4.11Eike Ziller2019-11-117-6/+240
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/datasources/servicesource.cpp src/datasources/servicesource.h Change-Id: I4c2b815f3a4963d32d9ee4f053b727ce6df710c6
| | * Store hashed project names in the plugin settingsv4.10.24.10Vitaly Fanaskov2019-10-162-6/+33
| | | | | | | | | | | | | | | | | | Fixes: QTCREATORBUG-23063 Change-Id: I67bc5492818069996440bfc6bd351850a35c642c Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| | * Implement separate data source for collecting additional technical dataVitaly Fanaskov2019-10-145-0/+207
| | | | | | | | | | | | | | | | | | | | | Fixes: QTCREATORBUG-22901 Change-Id: Ibd27d7241073675e79307d70e6b6ff44bb0ec069 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Janne Anttila <janne.anttila@qt.io>
| * | Move dummy targets back to toplevelEike Ziller2019-11-062-2/+1
| | | | | | | | | | | | | | | | | | | | | Another fixup of 93872ad36604e02a93ce310a7c34cfe32d7c76aa Change-Id: I693e6c771c3aad5303b297fea13f8b86a104d014 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * | Fix build after moving sources to srcEike Ziller2019-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | Follow-up of 93872ad36604e02a93ce310a7c34cfe32d7c76aa Change-Id: I1fae3e00ea85713981b07277b4ad201df417b73b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * | Replace "Usage Statistic" with pluralKai Koehne2019-11-043-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always talk about "Usage Statistics" in the UI. So far we have been using a mixture of 'statistic' and 'statistics'. Anyhow, a 'statistic' is a single measure, and we measure different things, so calling it statistics is more appropriate. Change-Id: Ie79167ebdfbf012124b1cd3068664ad82b7537b2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * | Improve descriptions of Data sourcesKai Koehne2019-11-044-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replace 'the user' by 'you', because the person opening the dialog is the user. Also, fix some typos, grammar issues. Change-Id: Ieeab07fa885356e4fb24cce47d22fd3f1c444922 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
| * | Move sources into src subdirKai Koehne2019-11-0142-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to add a CMakeLists.txt for the super-build. Change-Id: I53566819281245c0d79d6527222d6f3a824e73dc Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
* | | Merge remote-tracking branch 'origin/4.11'Eike Ziller2019-09-301-2/+2
|\| | | | | | | | | | | Change-Id: I968caa5274ef74f7b99b6e7082ee61a1122f1c3b
| * | Merge remote-tracking branch 'origin/4.10' into 4.11v4.11.0-beta2v4.11.0-beta1Eike Ziller2019-09-301-2/+2
| |\| | | | | | | | | | Change-Id: I560cb1bf6b8342c563a864880f39701e9a1eca32
| | * Do not use qOverloadv4.10.1Eike Ziller2019-09-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Not supported with MSVC2017 Change-Id: I2a3f4afc49005dd686f70950f5f104f57a5cbbd1 Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | | Merge remote-tracking branch 'origin/4.11'Eike Ziller2019-09-3016-110/+37
|\| | | | | | | | | | | Change-Id: I94fe550283cd6a5e9697ce4c2c6f04dff7ee0987
| * | Merge remote-tracking branch 'origin/4.10' into 4.11Eike Ziller2019-09-3016-110/+37
|/| | | |/ | | | | Change-Id: If304d15ea4d259fcc9c5b51716a0790ec5a03dbc
| * Fix build with GCC 5(.5)Eike Ziller2019-09-307-12/+11
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-22862 Change-Id: Iebfb84af2c5cd530a447f2b8a8296fcc171327d8 Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Fix gcc5 buildsVitaly Fanaskov2019-09-305-11/+22
| | | | | | | | | | | | Task-number: QTCREATORBUG-22862 Change-Id: I255952272a69ea8110e3ddceb63d15084af656f0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * Switch to qmake-based KUserFeedback buildAlessandro Portale2019-09-304-87/+4
| | | | | | | | | | | | | | | | | | | | | | | | ...instead of trying to combine a qmake and a CMake build system. Temporary hack until Qt Creator packages get built with CMake. Task-number: QTCREATORBUG-22860 Change-Id: Ibc51a26b73c78e6db8cffc8767fe24653aa5391c Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io> Reviewed-by: Tuukka Turunen <tuukka.turunen@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Merge remote-tracking branch 'origin/4.10'Eike Ziller2019-09-201-1/+1
|\| | | | | | | Change-Id: If281565b80cbb52786376ee321f0b9f55ced50ad
| * Don't overwrite extra targets that were added beforeEike Ziller2019-09-201-1/+1
| | | | | | | | | | | | | | Fixes c35781480130308f6624b459544b6c0292d881e7 Change-Id: I910b95c664e232b1bb1763d496f6ad42ac8f8447 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.10'Eike Ziller2019-09-181-0/+3
|\| | | | | | | Change-Id: Id813bdc7f6f7b943c26db3ab08843a3ed1ee1b6a
| * Add dummy targets for docs & install_docsEike Ziller2019-09-181-0/+3
| | | | | | | | | | | | | | | | These are assumed to exist for the packaging builds Change-Id: Ie98c53cf5ec4d0e7376770f8130f97076b9b3507 Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Merge remote-tracking branch 'origin/4.10'Eike Ziller2019-09-171-11/+18
|\| | | | | | | | | | | | | Conflicts: usagestatistic.pro Change-Id: Ie0b5062b447ddb2ab4073fcd38812897d0ba9988
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 01:17:07 +0000