summaryrefslogtreecommitdiffstats
path: root/src/tools
Commit message (Collapse)AuthorAgeFilesLines
* Remove the rest of qmake based configurationMichal Klocek2021-10-141-55/+0
| | | | | | | | | | The only not cover part in cmake port are: * ios builds for qtpdf * qt static dependecies for qpdf Pick-to: 6.2 Change-Id: Iefe624c35d847b4a9c3cd970192487340b1657f9 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Add spellchecker support and qwebengine_covert_dict to cmakeMichal Klocek2021-06-141-248/+0
| | | | | | | | | Add spellchecker dictionary conversion tool. Change scope of gn object imported variables to function scope. Pick-to: 6.2 Change-Id: Ice579a89e20b80034b675e7f767a774100478472 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-01-251-2/+2
|\ | | | | | | | | | | Including update to 87-based Change-Id: I36b6054e00de97ab055d0bc800cff08d0408fac6
| * Adaptations for Chromium 87Allan Sandfeld Jensen2021-01-131-2/+2
| | | | | | | | | | Change-Id: Ic4ffd98e02f986dbaf986405360e727c813e696e Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Update dependencies on 'dev' in qt/qtwebengineAllan Sandfeld Jensen2020-11-021-1/+1
| | | | | | | | | | Change-Id: I74c7293ebf5ace5bd07e3bf5455dd90bf4ed6380 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Fix almost all deprecation warningsJüri Valdmann2020-08-131-2/+2
|/ | | | | | | | | | | | | | | | | | | | | | Replace QString::fromUtf16({const ushort * -> const char16_t}) QMap::{unite -> insert} Q{Hover,DragEnter,DragMove,Drop}Event::{posF() -> position()} Q{Hover,DragEnter,DragMove,Drop}Event::{pos() -> position().toPoint()} Q{DragEnter,Drop}Event::{mouseButtons -> buttons} Q{DragEnter,Drop}Event::{keyboardModifiers -> modifiers} QMouseEvent::{localPos -> position} QMouseEvent::{windowPos -> scenePosition} QMouseEvent::{screenPos -> globalPosition} These should all be just renames without any change in behavior (save for some floating point conversions). The one remaining issue concerns the deprecation of binary JSON in qtbase, which is recommended to be replaced with CBOR. Change-Id: I8f3b533242fe9a58c08c2b09ff5d0bdbbfa6dd17 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Replace qgetenv with qEnvironmentVariableAllan Sandfeld Jensen2020-06-301-1/+1
| | | | | | | | | This preserves unicode characters in the environment variable on Windows. Fixes: QTBUG-85054 Change-Id: I3352cc3db4ce8d7b9b352c1634e3239954780618 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* Fix builds against Qt 5.12v5.15.0-beta4Allan Sandfeld Jensen2020-04-101-16/+16
| | | | | | | We need to provide the last update possibility for Qt 5.12. Change-Id: I3dbf327ad5ef149046744ed2db57a1d56dc8e7fd Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix deprecation warningsKirill Burtsev2020-01-191-16/+16
| | | | | | | | | | | Suggested changes: * endl -> Qt::endl * {} for default QFlags * QString -> QStringLiteral for QStringList::join * QNetworkReply::error -> networkError Change-Id: I03919ab0675a9beb64bd176e6c681a338b08b51e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Adaptations for Chromium 77Allan Sandfeld Jensen2019-10-111-0/+3
| | | | | | Fixes: QTBUG-77267 Change-Id: I181e24cf80ebee6991b95dde6c636f0d169b40a4 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Adaptations for Chromium 76Allan Sandfeld Jensen2019-10-111-0/+1
| | | | | Change-Id: Id6d18a3854b572334dc1d65f1916b8991a740cd2 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* Adaptations for Chromium 72Allan Sandfeld Jensen2019-03-232-1/+5
| | | | | Change-Id: Ic355257066c7c1433862cb41e6f2bfa831147e0d Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* Adaptations for Chromium 68Allan Sandfeld Jensen2018-09-221-1/+1
| | | | | | Together-with: Tamas Zakor<ztamas@inf.u-szeged.hu> Change-Id: I805246b6f01cb151fff48588744408c676d87c14 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Add more error output to qwebengine_convert_dictJüri Valdmann2018-08-271-12/+28
| | | | | | Task-number: QTBUG-70034 Change-Id: Ia1c18845f480225e3f50cf7199cdf85a3fb4f158 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Build without iterator debuggingJüri Valdmann2018-04-171-5/+0
| | | | | | | | | | | Iterator debugging (aka standard library debug mode) with libstdc++ slows down some code by orders of magnitude due to locking for each iterator operation. Disable on non-MSVC platforms. Task-number: QTBUG-66904 Change-Id: Ibb31f32235084b52988ac674b4b0bb1b198eed88 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Adaptations for Chromium 63Allan Sandfeld Jensen2018-01-251-1/+2
| | | | | Change-Id: I551c7091bbc0463bed94180313eb2bfe92f0ad84 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Merge branch '5.9' into 5.10Allan Sandfeld Jensen2017-11-011-0/+6
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/core/core_module.pro src/core/delegated_frame_node.cpp src/core/surface_factory_qt.cpp src/webenginewidgets/api/qwebengineprofile.cpp tests/auto/widgets/widgets.pro Change-Id: I92f3ef4eee779afef6c5381a7aa8b551417c1b17
| * Fix qwebengine_convert_dict to pick up correct ICU resources locationAlexandru Croitor2017-10-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The conversion tool uses the QLibraryInfo::location() call to find Qt's data directory. When a qt.conf file gets picked up by the application (which is the case for official Qt packages), QLibraryInfo::location() depends on a QCoreApplication instance being available, to query the PrefixPath. If the instance is not available, it simply returns the current directory path, which results in ICU resources not being found. The fix consists in creating a QCoreApplication instance. Task-number: QTBUG-63593 Change-Id: I8f1bba14d4586c42570d309b84418eef611bab0e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Allan Sandfeld Jensen2017-09-291-1/+1
|\| | | | | | | Change-Id: I7094e85a7770303a2ae30baccbc484c04f33600e
| * Add LICENSE.ChromiumKai Koehne2017-09-201-1/+1
| | | | | | | | | | | | | | | | | | The mentioned LICENSE file is not available; add it under the name LICENSE.Chromium. Task-number: QTBUG-60006 Change-Id: Ib2b3cb64467046c7ba1f53b0bbe14c3ec5a5291d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Win: Set proper descriptions for toolsKai Koehne2017-09-061-0/+2
|/ | | | | | | | This is shown in the file properties and in crash dialogs. Task-number: QTBUG-61970 Change-Id: I9e5398cbaff1eda4908fbe0fc89c481d65808771 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix qwebengine_convert_dict to work with macOS framework buildAlexandru Croitor2017-05-161-0/+16
| | | | | | | | | | | | | | | The ICU data file in a macOS framework build is located inside the QtWebEngineCore.framework/Resources directory. The dictionary conversion tool looked for the ICU data file only in the installed Qt location directory, which is incorrect, thus leading to a conversion failure. The fix is to check for the data file in the QtWebEngineCore framework directory. Task-number: QTBUG-60707 Change-Id: Ic2325e2b5a5db4e7cbcea3bed92755d5f8b92f95 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Remove gyp handlingAllan Sandfeld Jensen2017-03-221-20/+14
| | | | | | | Remove now dead GYP related code. Change-Id: I7d5b8f28f8925e553211dc88acd571b605ffe80d Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Allan Sandfeld Jensen2017-03-022-3/+35
|\ | | | | | | Change-Id: Iff6ab3c287c58d8ec84a1513460bfce5218e8a61
| * Fix building spellchecker example when Qt is not yet installedAlexandru Croitor2017-02-212-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the build of the spellchecker example, the dictionary conversion tool is executed to convert some dictionaries. The tool will fail to find the ICU data file because the file is not present at the Qt install location at examples build time. The fix is to allow passing the ICU data directory via an environment variable. Specifically the QtWebEngine build directory which contains the ICU data file will be passed when the spellchecker example is built. Task-number: QTBUG-58451 Change-Id: I6188f0b7aabe8b2e55cd2e0d59553282058c5035 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Fix release builds for debug and release buildsMichal Klocek2017-02-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Small typo makes debug builds make release. Fix core lib and covert tool compilation for debug builds. Updates chromium: b0bb0288 Fix debug builds compilation Change-Id: Id478ab5e2a2a1b3d5716002f76f252451f69f5ac Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | macOS GN integrationAlexandru Croitor2017-01-271-1/+6
| | | | | | | | | | Change-Id: I89850d43c8f11ec54b3a47318ef0b3f083ae3dee Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Add gn build of qtwebengine for linuxMichal Klocek2017-01-251-4/+18
|/ | | | | | | | | | | This commit uses gn instead of gyp to build on desktop linux. Use WEBENGINE_CONFIG+=use_gn to use gn during the build instead of gyp. Change-Id: Ifd3d8d0835b47c323a8d39c320eb55e5e1024dee Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Change linking information for qwebengine_convert_dictMichal Klocek2016-10-171-2/+3
| | | | | | | | | | | | | | Use convert_dict_linking.pri instead of QtWebEngineCore_linking.pri for qwebengine_convert_dict linking step. New linking information contains only required dependencies, so linker should have much less work to resolve all the symbols. The target change to executable is also required to generate convert_dict_linking.pri Task-number: QTBUG-53135 Change-Id: I1432207bd1853e762d5d8291ce61027592fd0161 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Disable warning for build of qwebengine_convert_dict tool on WindowsPeter Varga2016-07-281-0/+3
| | | | | Change-Id: I02bc9284c790946532337045032747e072d1cd45 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Adds qwebengine_convert_dict toolMichal Klocek2016-05-062-0/+205
This is a tool which converts hunspell 'dic' dictionaries to binary 'bdic' format, which is required by spellchecker in chromium. Tool is compiled as a qt console application. It reuses linking information produced by gyp. This tool cannot be used in cross-builds due to limitations of the gyp-based build system. Change-Id: Ibee8cbc6048b522c0e4fe22b21c91c649c8515bc Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>