summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Prepare merge of qds-1.59 to 4.13qds-1.59Marco Bubke2020-08-1312-9/+16
| | | | | | | It is not compiling but we are closing this branch anyway. Change-Id: If96318175d92ae492871d668d5c937c473fd05d5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlPreview: Fix crash at shutdownMarco Bubke2020-08-101-1/+4
| | | | | | | Seem like it get a nullptr project at shutdown. Change-Id: I76d9f4b2b90b0641d645cb413f9ebfe678bb1c9f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Split messaging and process for puppetsMarco Bubke2020-08-1046-833/+1736
| | | | | | | | | | This will make it easier to implement custom puppets. The new connection manager will restucture the code and it add a mechanism to capture data too. Task-number: QDS-2529 Change-Id: I5d15c3303ef1c9a3e25ba197d350e0d561ce813a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix bool handling in the list model editorMarco Bubke2020-08-102-0/+77
| | | | | | Task-number: QDS-2581 Change-Id: I47a9ed4ca55532bb7199a6c5dd4894b7adb7d05d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix crash for list view modelMarco Bubke2020-08-104-25/+96
| | | | | | | | | There was a type, so it crashed. The code is now under tests so we cannot break it anymore. Task-number: QDS-2563 Change-Id: I81426a9f8a568b217b7bf9c8c261b24be14ff61a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix typo bugMarco Bubke2020-08-101-2/+2
| | | | | | Change-Id: I074beda7dc5fa6dc2775e764983bf72e17ea90cf Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
* Change encoding to Unicode (UTF-8)Kwanghyo Park2020-08-071-1/+1
| | | | | | | | | | | There is an error while build on the machine which needs Unicode encoding for compile. Most of the files are fine but not the fixed file. So changed the files encoding to Unicode. Change-Id: I8abb2471c26231c8d659dcacd99e71f8d255415f Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* qmlpreview: fix compileTim Jenssen2020-07-231-2/+2
| | | | | Change-Id: I7c9b82637217e45c6d239413df07cc9d62440603 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* fix build on older compilersTim Jenssen2020-07-231-4/+6
| | | | | Change-Id: Id5ccad524c7609eb789d7fa805ace0719a807e65 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* qmlpreview: add debugtranslation uiTim Jenssen2020-07-2315-21/+872
| | | | | | | | | | | | | action in the menu will only be shown if a QtStudio Qt is found qtversion.xml <value type="QString" key="overrideFeatures">QtStudio</value> - still have some issues with multiple file test runs so disable it for now - elideWarning is not tested Change-Id: I68c9f774a980b84cd4eea1595775fd01afa6f3cf Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* qmlproject: rename lastUsedLanguage -> currentLocaleTim Jenssen2020-07-235-21/+24
| | | | | | | | | | | | | removed the connection from plugin to QmlMultiLanguageAspect::setCurrentLocale but calling it directly in QmlPreviewPlugin::setLocale Does not matter which method is called it will change the right thing only once because it is checking if it already have the set locale. Change-Id: I6cb4b115788adc103481dcda45e3214a0cd73401 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* qmldesigner: fix none pre compiled header buildsTim Jenssen2020-07-221-0/+1
| | | | | | Change-Id: Ic8c588596292a466368aad2f8a00a0c02049e1af Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Łukasz Ornatek <lukasz.ornatek@qt.io>
* Support multiline text, fix text formatLukasz Ornatek2020-07-221-0/+1
| | | | | | | | Explicitly set TextFormat to "RichText" when using rich text editor Task-number: QDS-2229 Change-Id: I8f0110415b8125465779231426e66ecc53eae5fe Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* Support multiline textLukasz Ornatek2020-07-215-5/+217
| | | | | | | | Use rich text editor widget as dialog for multiline text input Change-Id: I13147e776867032fe1145d6a8a37fcd6976399e4 Task-number: QDS-2229 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* qmlpreview: fix init locale issueTim Jenssen2020-07-215-13/+25
| | | | | | | | | The init language was never found, because the findValidI18nDirectoryAsUrl() uses the m_lastLoadedUrl to find the translation file path. Change-Id: I6e9b62f3d846795d68ddef5e3a4caf3e3d953c7c Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* qmlpreview: fix translation for qml files in subdirectoriesTim Jenssen2020-07-211-2/+10
| | | | | | | | | Found path was ignored - so the location was wrong Keeping the kind of ugly in findValidI18nDirectoryAsUrl(const QString &locale) for now - to not change too much in that area. Change-Id: I491df1f928868a8d9afbbb7d25c8102bbe9b51a7 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* qmlproject: add convenience method to QmlMultiLanguageAspectTim Jenssen2020-07-214-17/+35
| | | | | Change-Id: I88799aa1c5caa5c967b7c680ef9ddcbdd4b01bf5 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* qmlpreview: stop previews if the language backend is changedTim Jenssen2020-07-212-1/+5
| | | | | Change-Id: Iadf0712ea429f3bdb8c4109dfb558466fa2743f2 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* Revert "qmlpuppet: do not set an empty QT_MULTILANGUAGE_DATABASE"Tim Jenssen2020-07-211-1/+1
| | | | | | | | | | This reverts commit 00b54f7faf33d679d62d309c9ccaf7ef60087483. Not sure why this was necessary - but it introduced a problem which needs a restart of the puppet - so it is easier to revert it. Change-Id: I4664b57eefc961ac814e4594b28bbd155be21042 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* qmlpreview: remove unnecessary includeTim Jenssen2020-07-201-1/+0
| | | | | Change-Id: Ia2ffd868bcb1cb1b09aafa1f63132308bf829062 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* qmlpuppet: do not set an empty QT_MULTILANGUAGE_DATABASETim Jenssen2020-07-201-1/+1
| | | | | Change-Id: Ib64a2192692a2675852fd3071295c0ed8dc29d4d Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* qmlpreview: fix crash while closingTim Jenssen2020-07-201-1/+1
| | | | | Change-Id: Iee1083ff7c3e2e6dd511f1d54d72681e402d6c24 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* qmlpreview: remove redundant set QT_MULTILANGUAGE_DATABASETim Jenssen2020-07-201-5/+0
| | | | | | | | already done in the environment modifier method at qmlprojectrunconfiguration.cpp Change-Id: Ibd1e2ffb94bec23e709d9155b032bb358b7f4a0c Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* qmlproject: remove unnecessary separatorTim Jenssen2020-07-201-1/+1
| | | | | | | results in two separators which looks wrong Change-Id: Ie715e1b504303a9ab819ede08b1e69095c5d870d Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* qmlproject: no need to use raw pointer hereTim Jenssen2020-07-201-1/+1
| | | | | Change-Id: Idbd97a7ab4a78d3e56b3f444b7b48111d7823dd6 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* qmlproject: act on disabling multiLanguageAspectTim Jenssen2020-07-201-0/+3
| | | | | Change-Id: I2f13090f8708a5cb46bf21fb0e855d8ca9d906e7 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* QmlDesigner: Fix prefiew sizeMarco Bubke2020-07-171-4/+1
| | | | | Change-Id: I126c50209f2849d0212f0d295b35cba0f25f2728 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Bump up database version to 2Marco Bubke2020-07-171-1/+2
| | | | | Change-Id: I4b4c4c46c3bd17d2b4f4f80b8fb97f5716261f77 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* qmlpreview: remove unnecessary connectTim Jenssen2020-07-151-4/+0
| | | | | Change-Id: Ib846256c0eef2d2cccfd46a9ac27dbbf312eef8b Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* projectexplorer: add availableQmlPreviewTranslations()Tim Jenssen2020-07-154-24/+28
| | | | | | | Preparation for a test translations feature. Change-Id: I1a7ccecab803f5838cd765b7dca99bcf5bb9e8a1 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Fix a crash in the curve editorKnud Dollereder2020-07-151-1/+1
| | | | | | | when ICore::dialogParent returns an unrelated dialog Change-Id: Ifd0facec3b8b97f6fba61904c2a729e46622e515 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* AssetExporter: Add display name to the exported jsonVikas Pachdha2020-07-152-1/+21
| | | | | | | | This shall be used for layer names Task-number: QDS-1556 Change-Id: I3ffce208d830f291de48105ec9cf92e76692f8bd Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* AssetExport: Assign export type component to QML componentsVikas Pachdha2020-07-153-2/+10
| | | | | | Task-number: QDS-1556 Change-Id: I99c0e0219aa040b74794ab28cf0da7970a81663a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* AssetExport: Fix metadata schemaVikas Pachdha2020-07-154-9/+16
| | | | | | Task-number: QDS-1556 Change-Id: I13aef8af5094cf6a5c3f53f92643fd23492922d8 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* add litehtml to dev packageTim Jenssen2020-07-101-0/+1
| | | | | Change-Id: If33500eda8d095d1d9d63afe4ad8331109a22871 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: Add row move up and move down buttonsMarco Bubke2020-07-085-0/+301
| | | | | | Task-number: QDS-2294 Change-Id: Ia1e64d0811f55151dfe529db4868821840a8fba9 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Move code from list editor dialog to modelMarco Bubke2020-07-084-48/+165
| | | | | | | And add tests to the code. Change-Id: I9fb183729c716a50bbab861d207a212ff704ee7b Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Add adjustable frame colorMarco Bubke2020-07-083-1/+21
| | | | | | Task-number: QDS-2238 Change-Id: I6f43a7c87ae4c8daaf41c08ad2960502770fba58 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* sqlite: exceptions are necessary for sqliteTim Jenssen2020-07-021-0/+2
| | | | | | | | Qt itself is using no exceptions but if we want to use this sqlite access code we need to enable it. Change-Id: Id69b8527c612e06a534bc100e5339cddf5471917 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* Utils: Fix small string ostream operator <<Marco Bubke2020-07-021-6/+1
| | | | | | | | | It was used for test printing so we could see '\n' printed. I have to find a better way todo it only for tests. Task-number: QDS-2459 Change-Id: I10b38645bfdb8160cb9aeccd62c50a81fe953345 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* AssetExport: Avoid null pointer dereferencingVikas Pachdha2020-07-011-3/+2
| | | | | Change-Id: Iea146c41800139bcf9bd8e917a47293ce3504cf4 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: Fix cmake buildMarco Bubke2020-07-011-1/+1
| | | | | Change-Id: I2155c4730de5ece18a1e0595da0523aa8c42f7c4 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* UnitTests: Temporary disable the testsMarco Bubke2020-07-011-1/+1
| | | | | | | | | I added QmlDesigner to the unit tests but I have no clue have this can work with CMake. We only want some source files and are preloading some other header. Change-Id: Iadf8ca09b7e63055d1e2ff231a15ef7be2891204 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Add missing headerMarco Bubke2020-06-301-0/+2
| | | | | Change-Id: I028438968176af0c42759de06d93b8043383cfe9 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* AssetExport: Fix build errorVikas Pachdha2020-06-301-1/+1
| | | | | Change-Id: I11fb23e15e11a7542faccb7c1ed3db6936021db2 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Add listmodeleditorMarco Bubke2020-06-3022-56/+1638
| | | | | | Task-number: QDS-2294 Change-Id: I66cae3a0d4265ab112eaf6b04e3a5972d185ff43 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ClangFormat: Relax the clang format file a little bitMarco Bubke2020-06-301-19/+3
| | | | | | | | | It will not always insert a line break after 100 sign but tries to find middle ground. Normally it's not a problem but it will prevent some strange looking formatting. Change-Id: I0ba987f944d360b3d0f0d8dce29ef825696b1a92 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ClangRefactoring: Remove not used pch filesMarco Bubke2020-06-3015-22/+260
| | | | | | | | | Because we use UUID for pch files every time we rebuild a pch we get a new file. This patch is collecting and removing this pch files. Change-Id: Ia8688e7215ee7b41f39b2285323eaa345056bda3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Refactoring: Fix unit testsMarco Bubke2020-06-3010-77/+30
| | | | | | | | One if the LLVM 10 hot fixes was not working. Change-Id: I1e6cab39ffd5c52f55fb83ff777f6eca457dea35 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Break dependenciesMarco Bubke2020-06-3025-7/+1168
| | | | | | | | | To get the model under unit tests we have to break every depenedency to code outside of the unit test scope. Change-Id: Ib613c3308e48990c55b2ed0cd42bc4b0e1041a01 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
View Lorry Controller Status