Commit Graph

13 Commits

Author SHA1 Message Date
Leena Miettinen
9688f33a5d QML Preview: Fix UI text
Fix capitalization and make some strings shorter.

Task-number: QTCREATORBUG-24873
Change-Id: I78d0d1507774ab732f633f8849a3f45f6835110f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-09 12:42:25 +00:00
Orgad Shaneh
f60302591b Merge remote-tracking branch 'origin/4.13' into 4.14
Change-Id: Ifa2e1ced939e1d049ba6de667b31ab9945094b87
2020-10-12 14:55:54 +03:00
Tim Jenssen
ddb078404a qmlpreview: add test translation color settings
Change-Id: I9b11fcf1fdae39b089887884a3d96cc8648a0c8a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-10-12 07:27:57 +00:00
Eike Ziller
5ab8cc61fc Merge remote-tracking branch 'origin/4.13' into 4.14
Change-Id: Ia20a937786be651a5fe9daefb856f7779905ef68
2020-10-08 09:46:09 +02:00
Tim Jenssen
bfc04ed53d qmlpreview: enable adding multiple testlanguages
Task-number: QDS-2531
Change-Id: I558f6d1040148ff4a392f5c5cfc6af4da54fef70
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-10-07 14:55:31 +00:00
Tim Jenssen
9dda8af0b0 qmlprieview: fix that init language is the chosen one
* removes language feature from preview service
* it is handled by an extra DebugTranslationService until now
* Qt versions without that extra service can not preview
  languages anymore
* Introduce the use of QmlPreviewRunnerSetting. It makes it
  easier to add more properties in the future
* Language needs an extra handling because it needs
  the loadUrl to find existing languages. So we save
  the language to a m_scheduledInitLanguage and emit
  this after the loadFile call happend.

Change-Id: I7f4aec97f7b61d6b290f225282169da594eb9160
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-10-07 14:55:17 +00:00
Eike Ziller
423ea729f8 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/mcusupport/mcusupportoptions.cpp

Change-Id: I3fd0d0a6a3ff30bb990da3dc0f78e69f9e1247ef
2020-09-23 10:11:44 +02:00
Lukasz Ornatek
0831c07cb3 Make Translation Tests ignore imported files
Change-Id: I4abd222bd15da79a1fe14d01b8a4a1f25d935b3b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-09-17 14:50:08 +00:00
hjk
e62044aa29 Use Qt::SkipEmptyParts unconditionally
Squashes a warning in qmldebugtranslationwidget and is safe to use
with Qt 5.14.

Change-Id: I1912e7379a570a17fbf057b87390a63d524ced49
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-14 06:41:46 +00:00
Marco Bubke
dc870f538d Prepare merge of qds-1.59 to 4.13
It is not compiling but we are closing this branch anyway.

Change-Id: If96318175d92ae492871d668d5c937c473fd05d5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-13 06:24:10 +00:00
Tim Jenssen
49bce1d9e6 qmlpreview: fix compile
Change-Id: I7c9b82637217e45c6d239413df07cc9d62440603
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-07-23 17:05:29 +00:00
Tim Jenssen
955f124ffd fix build on older compilers
Change-Id: Id5ccad524c7609eb789d7fa805ace0719a807e65
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-07-23 11:43:43 +00:00
Tim Jenssen
1f702edfd3 qmlpreview: add debugtranslation ui
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>
2020-07-23 09:42:46 +00:00