aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Sqlite: Fix unittest build on macOSqds/v2.0-beta1Christian Stenger2020-11-161-3/+3
| | | | | Change-Id: Id412d0098a1287d5e93c29690bfcf269be1315f3 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* cmake build: Fix building with PCHsEike Ziller2020-11-162-3/+5
| | | | | | | | | | | - fix target name - build pchs without extensions like all other targets - require CMake 3.10 for plugins Amends c038abb0abc9c346d5041c4cbbe201905e2ac041 Change-Id: I0eae58a9e7ce91c0df6103790cb91a5229d06051 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* QmlJS: Ensure QtQuick is the first importMiikka Heikkinen2020-11-161-1/+6
| | | | | | | | | | | | Some items will show empty property panel and cannot be reparented in QmlDesigner if the module that defines the item is imported before QtQuick module. This fix ensures QtQuick module is always imported first. Change-Id: Ie610fef681f5bf0ac62d1b879bb9306d4f7d293b Fixes: QDS-3115 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Update icon fontHenning Gruendl2020-11-163-42/+48
| | | | | | | | * Add flow action, flow transition and search Change-Id: I87fc48904b5f1a56aca34f2a66b2aef4657d86bc Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* KSyntaxHighlighter: Fix compile with Qt5.14Christian Stenger2020-11-161-1/+1
| | | | | Change-Id: I9a98717ba99357940ab8b42c025bea4ecfa42102 Reviewed-by: David Schulz <david.schulz@qt.io>
* AutoTest: Fix using of cacheChristian Stenger2020-11-161-2/+14
| | | | | Change-Id: I3f7695c96139c1f1809631ead1b723e3820b240d Reviewed-by: David Schulz <david.schulz@qt.io>
* Editor: Qt6 compile fixes for KSyntaxHighlighterDavid Schulz2020-11-1617-36/+39
| | | | | Change-Id: I65487a3ccb93efeec3be3971f876d317b5a6bfc6 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Editor: update KSyntaxHighlighting to v5.75.0David Schulz2020-11-1694-3319/+4563
| | | | | Change-Id: Ibef1526fccf52920d0d557c8b8f3a52bec5550f8 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlProfiler: Fix flamegraph testChristian Stenger2020-11-161-2/+2
| | | | | Change-Id: I27d7067a844e614334a5faedcb2915b3a24ae5e0 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Doc: Mention re-running failed testsChristian Stenger2020-11-162-0/+5
| | | | | Change-Id: Ief2b7ebbee89a23b77259f65207d641af3ed2623 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* QmlDesigner: Rename methodThomas Hartmann2020-11-132-7/+7
| | | | | Change-Id: I43e85703b8a09c33a0685487a42ae333439d9beb Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CMake Build: Fix problems with PCH and super repoCristian Adam2020-11-131-7/+7
| | | | | | | | | | Make sure that every project will have its own precompile headers sets. This fixes problems with MSVC. Change-Id: I37d58c9652f679545283907e7cad70cd579911a8 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Update change log for 4.14Eike Ziller2020-11-131-0/+21
| | | | | Change-Id: I03a687bc3bca45f74ea0c46c54a63a8bf535554c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* cmake build: Use CMAKE_INSTALL_NAME_TOOL instead of hardcodingEike Ziller2020-11-131-2/+2
| | | | | | | Amends 98db9774f2363314f51b1732646396112418320e Change-Id: I4aaaddcfc0e5cc31bb0646a3a3ccc18ee2fa5ff1 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CppEditor: Improve "definition from declaration" for templatesChristian Kandeler2020-11-133-8/+25
| | | | | | | | | | - Make sure the template parameters are included in the definition. - Find the correct insertion location when using an already-defined template member function as an anchor. Fixes: QTCREATORBUG-24848 Change-Id: I1272ba36403904e7aed81bcef48745793c5e2217 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Silence the warning about missing initializer for memberJarek Kobus2020-11-132-2/+2
| | | | | | | | | | | | | | | | | | | Silence the following warning: warning: missing initializer for member ‘clang::tooling::IncludeStyle::IncludeCategory::SortPriority’ [-Wmissing-field-initializers] 118 | style.IncludeStyle.IncludeCategories = {{"^<Q.*", 200}}; According to the docs of IncludeCategories, the SortPriority field is optional, and when not set its value is set to the value of Priority field. So in order to fix the warning we repeat the same value for SortPriority field. In addition we ensure that we require at least clang version 10.0.0. Change-Id: I8baae7a33ad1a7a7f3afe66779f482b29a7396b4 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Explilitly ignore the return value of QTranslator::load()Jarek Kobus2020-11-131-1/+1
| | | | | | | | Otherwise we are getting warning about unused return type of function marked with [[nodiscard]]. Change-Id: I07b464cc641ff1b6e36a0c84115deed1701e40d3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Get rid of setting deprecated attributes in Qt 6Jarek Kobus2020-11-131-1/+3
| | | | | | | | Setting AA_EnableHighDpiScaling and AA_UseHighDpiPixmaps attributes does nothing in Qt 6. Change-Id: I1744604f34294d809c594c66ef86b610ed6efb16 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* cmake build: Do not copy whole app bundle directory when installingEike Ziller2020-11-132-11/+79
| | | | | | | | | | | CMake just copies the whole app bundle directory when installing a target, but we copy various things there that should not be part of the installation, like static libraries, executables with SKIP_INSTALL, Clang resources, and potentially .dSYM bundles. Fixes: QTCREATORBUG-24021 Change-Id: I98bb466b664d2d6d203f3adc20d8345d9b3ce3cc Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Silence the warning about comparing type with different signednessJarek Kobus2020-11-131-1/+1
| | | | | | | | | Silence the warning: warning: comparison of integer expressions of different signedness: ‘const long long unsigned int’ and ‘const long long int’ [-Wsign-compare] Change-Id: I3e0ace4a9aa354f9c8b30814265e9d7516fbdc7d Reviewed-by: hjk <hjk@qt.io>
* Fix connection warnings on startup with Qt 6Jarek Kobus2020-11-132-4/+9
| | | | | | | | | | | | | | | Qt 6 removed the overload for QComboBox::currentIndexChanged(const QString &). Fix the following warnings on startup: qt.core.qmetaobject.connectslotsbyname: QMetaObject::connectSlotsByName: No matching signal for on_easingExtremesComboBox_currentIndexChanged(QString) qt.core.qmetaobject.connectslotsbyname: QMetaObject::connectSlotsByName: No matching signal for on_easingShapeComboBox_currentIndexChanged(QString) Change-Id: Iebfe727ca5c5105e1c6faf61284e3e0f6371da83 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Silence warnings about unused argumentsJarek Kobus2020-11-131-0/+8
| | | | | | | Silence warnings when QUICK3D_MODULE is not defined. Change-Id: I4974ce04e2d6185764d91767461e038eac59d90a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Get rid of compiler warningJarek Kobus2020-11-131-1/+1
| | | | | | | | Silence the warning: type qualifiers ignored on cast result type [-Wignored-qualifiers]. Change-Id: I3d02a1b71b6cece6d4fcfe209ef37cdf5556afba Reviewed-by: hjk <hjk@qt.io>
* QmlDesigner: Collect events for telemetry pluginThomas Hartmann2020-11-1310-6/+50
| | | | | | | | | | | | | | | For each action/event we want to track we emit QmlDesignerPlugin::usageStatisticsNotifier() with an identifer. This allows counting how many states, transitions, timelines were created and we track every registered action. More 'trace points' can be added later. Change-Id: Ibb31e1b7e20d984a10697e05bb4417e7ad1b8980 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Build in release mode on GitHubEike Ziller2020-11-123-6/+7
| | | | | | | | | | | | Add option to build scripts to override build type, so it can be freely chosen. Build in release mode on GitHub - RelWithDebInfo was too big. Amends b1640074e3630fff8d510c0f96efdfcfeedb93a1 Change-Id: Ibba6e60d4e9b2eee24e789bfd28bddffb1e782f6 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Do not setup imports when checkingThomas Hartmann2020-11-121-1/+4
| | | | | Change-Id: I4b3aabeb3384b25918ad9eac84fc44f1679da7a6 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Duplicate state in transactionThomas Hartmann2020-11-121-2/+5
| | | | | Change-Id: Ib7db0b82f17edc77adfa91869ac9333f9a6be679 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix for high dpi and Qt 6Thomas Hartmann2020-11-123-13/+20
| | | | | | | | | | | | | | | | | When grabbing the window we have to clip the window using the root item size. Depending on the window manager the window is resized. Another issue is that when grabbing the window offscreen the pixel ratio is always 1. Before we assumed that the pixel ratio of all images is the same for the host process as for the puppet. This is not necessarily anymore and we have to set and forward the correct pixel ratio. Change-Id: I36b467291ab120f825119adea4ed7db10d34266d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Hide windows againThomas Hartmann2020-11-122-7/+2
| | | | | Change-Id: I0b22a8bbaabaf2290aa134aebd0044fd81bb5e56 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner.MetaInfo: Add special case for "QML.QtObject"Thomas Hartmann2020-11-122-1/+17
| | | | | | | | In Qt 6 QML.QtObject is used as typename for QtQml.QtObject. Task-number: QDS-3117 Change-Id: Ib4b78d69781d946a7d5a3447841f20482c44ddf5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* yaml-cpp: Fix/suppress MSVC warningsOrgad Shaneh2020-11-123-8/+15
| | | | | | | | | | | | * C4251: 'YAML::Binary::m_data': class 'std::vector<unsigned char,std::allocator<unsigned char>>' needs to have dll-interface to be used by clients of class 'YAML::Binary' * C4275: non dll-interface class 'std::runtime_error' used as base for dll-interface class 'YAML::Exception' * STL4015: The std::iterator class template (used as a base class to provide typedefs) is deprecated in C++17. Change-Id: I37e32df84ee2d2946181aad790dabd0c3ed58c08 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* QmlPuppet: Disable navigator preview image creation in Qt6Miikka Heikkinen2020-11-121-1/+3
| | | | | | | | | This frequently crashes the puppet. Will be re-enabled once the underlying issue QTBUG-88320 is fixed. Task-number: QTBUG-88320 Change-Id: Ie4c1ad914e5bd62dcf3b132cea588ba6fc003bc5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Use single transaction to add stateThomas Hartmann2020-11-121-9/+4
| | | | | | | The QtQuick import has to exist. Change-Id: I2184a6981b8307b593bddcc2feba8dee28a7eaf3 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QtSupport: Prefer suffixed uicChristian Kandeler2020-11-121-3/+2
| | | | | | | | This prevents the wrong uic from getting picked up in the case where the unsuffixed version belongs to a different Qt. Change-Id: I3fe7b4afc25a2733c632bb0195ca7ea74666bdbf Reviewed-by: hjk <hjk@qt.io>
* Remove unneeded includesJarek Kobus2020-11-1222-32/+28
| | | | | Change-Id: I67fee9303509b7080e123a2a5826e200ce498ce2 Reviewed-by: hjk <hjk@qt.io>
* Debugger: Fix source mapping on WindowsOrgad Shaneh2020-11-121-1/+2
| | | | | | | | | | Path separators should be translated to '/'. That's probably was the intention for originally using QDir::cleanPath(), which was removed in b7c72f8621. Change-Id: Id7fdbc1e430b7d52da1bd7406fcfd777326bf593 Reviewed-by: hjk <hjk@qt.io>
* QmlDesigner: Add possibleImports to benchmarkThomas Hartmann2020-11-121-0/+1
| | | | | Change-Id: I84be55af408b80406d27ba6406e3b53e18b703c9 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: small improvements to the paste logicMahmoud Badri2020-11-123-15/+15
| | | | | | Change-Id: I256ffbe7f7eff1eb5796a368105d256d319c42bf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Merge remote-tracking branch 'origin/4.13' into 4.14Eike Ziller2020-11-124-11/+110
|\ | | | | | | | | | | | | Conflicts: src/shared/qbs Change-Id: If75741825f5788165f9bf2f0248e976811273b6a
| * Add changes file for 4.13.3v4.13.34.13Eike Ziller2020-11-121-0/+77
| | | | | | | | | | Change-Id: I88b845af94e16951b78c23668ba3eba07da594a7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Debugger: fix dumper for msvc release buildsDavid Schulz2020-11-061-6/+27
| | | | | | | | | | | | | | | | ... for std::vector and std::string. Change-Id: I5c823b6c1b7b510344eeea4e1d5db0791d5c8e53 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * shiboken2tasks.py: Fix for WindowsFriedemann Kleint2020-10-281-1/+2
| | | | | | | | | | | | | | | | File names were not captured since ':' was excluded which can appear in a file name on Windows. Change-Id: I4bbf08c63faa12d3b76d73e927aef1457c09e02f Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * Fix predefined annotationsLukasz Ornatek2020-10-271-4/+4
| | | | | | | | | | | | | | Task-number: QDS-3002 Change-Id: I1ccc586e19d3059a419431188bab58c84441c08c Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * Update Qbs submodule to the top of 1.17 branchIvan Komissarov2020-10-261-0/+0
| | | | | | | | | | Change-Id: Ibcd9d1b05d66038e4a9071cedc5c236cd8edb649 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Update Qbs submodule to the top of 1.17 branchIvan Komissarov2020-10-231-0/+0
| | | | | | | | | | Change-Id: I9551c70eaa1b5f2c3f9413f90c8c1d7b7394622f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Clang: Do not derive deprecated std::iteratorOrgad Shaneh2020-11-122-2/+14
| | | | | | | | | | | | | | Reported by MSVC. Change-Id: If89d1c41c7b52e48d01d0d4251c85de4785c73ec Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | scripts: make release with debug info defaultTim Jenssen2020-11-112-2/+2
| | | | | | | | | | Change-Id: If08eeb64bfda42780f6ba9223c3394ce8daf6a6b Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | cmake build: Fix permissions of scripts in installationEike Ziller2020-11-112-1/+6
| | | | | | | | | | | | | | | | CMake doesn't copy file permissions by default. Fixes: QTCREATORBUG-24907 Change-Id: I3f452502de49517f72ace1a4a2696c797c95bdfa Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Change Qt Creator plugin wizard to CMakeEike Ziller2020-11-116-216/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doesn't make sense to put more qmake-based projects out there for Qt Creator, so exchange the qmake version completely. Also adds a README.md, which explains how to build and run a plugin, since plugins no longer are built directly into a Qt Creator build (which is a good thing). Since we do not yet have a way to specify detailed build settings from a wizard, keep the hack that the project file has a hardcoded path to the Qt Creator development package. That way developers can at least directly build the new plugin without fiddling with build settings. Fixes: QTCREATORBUG-24073 Change-Id: If6650d9e3c393ee9ac2a358923dfb072ec510850 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | cmake build: Map generic IMPORTED_LOCATION for Qt6 toolsEike Ziller2020-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | There once was a time where the Qt6 build only set IMPORTED_LOCATION_<CONFIG> but nowadays it also sets IMPORTED_LOCATION. Use the latter to make it work with both debug and release builds of Qt6. Change-Id: Ic8b14209cb97b47eb6136e23390045e115a12ac0 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 17:11:52 +0000