Commit Graph

16 Commits

Author SHA1 Message Date
Marco Bubke
c2086e7854 QmlDesigner: Bump database version
Change-Id: I1342d85161e3d83de5411bd1a9ee97809b1ccfd7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-22 08:34:22 +00:00
Marco Bubke
da7b83b238 QmlDesigner: Bump multi language database version
Change-Id: Icd9b379c4dfbc09a8f949c86e0354d28f6184bc7
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-03-11 16:47:18 +00:00
Marco Bubke
00cec8a688 QmlProjectManager: Bump up version of the multilanguage database
Change-Id: I123171475f6d37241fdbe37c94725df718f5fe9f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-03-09 08:57:53 +00:00
Marco Bubke
70f50b3503 QmlDesigner: Bump up database version
We change the database schema.

Change-Id: I2715f47995374fe3d17ba97af9287af198c28959
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-01-27 09:44:47 +00:00
Jarek Kobus
c9f5ce51e0 Don't use iterators to temporary containers
Fix a clazy warning, like:
Don't call QVector::begin() on temporary [clazy-temporary-iterator]

Indeed, we may pass begin and end iterators for 2 different
instances of temporary vector (shared though).

In addition: use const iterators.

Change-Id: Iac1055d9fc226f1b48ca72ee4f3aab433addfe7f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-20 12:25:31 +00:00
Eike Ziller
4d39f2736f Merge remote-tracking branch 'origin/4.13' into 4.14
Change-Id: If549dd1bc610704ece881c408cf44192dabed8b9
2020-10-19 14:10:51 +02:00
Tim Jenssen
57e77ec449 qmlpreview: fix calling right localeIsoCode method
Also add some QTC_CHECK to get at least some warning
in case the functions are renamed in future.

Change-Id: Ie4e78855152e9946950603c95fa881755e850c62
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
(cherry picked from commit 165ccb828d)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-10-14 15:14:48 +00:00
Eike Ziller
2a05186194 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	CMakeLists.txt

Change-Id: I799060da2cb299bb0c49a3da3530fad18427a23c
2020-08-21 10:08:55 +02:00
Thomas Hartmann
02c9f0384c QmlProject: Fix crash
Change-Id: I6b83b6c05b1c94f62c868329ea118d638d9928b6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-20 12:12:46 +00:00
hjk
51e7bce109 ProjectExplorer: Rename Base*Aspect to *Aspect
In most cases they are used directly, so there's not much Base* in that.

Added the old name as alias as porting help for a while.

Change-Id: I494a8a560b8996bcf74915ea3570b504df6a6b4c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-14 07:35:43 +00:00
Tim Jenssen
bde420f7b7 qmlproject: rename lastUsedLanguage -> currentLocale
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>
2020-07-23 09:14:31 +00:00
Tim Jenssen
b45b771581 qmlproject: add convenience method to QmlMultiLanguageAspect
Change-Id: I88799aa1c5caa5c967b7c680ef9ddcbdd4b01bf5
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-07-21 15:37:41 +00:00
Tim Jenssen
3659f5b41d qmlpreview: stop previews if the language backend is changed
Change-Id: Iadf0712ea429f3bdb8c4109dfb558466fa2743f2
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-07-21 15:37:31 +00:00
Tim Jenssen
d628a7c6cd qmlproject: remove unnecessary separator
results in two separators which looks wrong

Change-Id: Ie715e1b504303a9ab819ede08b1e69095c5d870d
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-07-20 16:56:21 +00:00
Marco Bubke
5b63599473 QmlDesigner: Bump up database version to 2
Change-Id: I4b4c4c46c3bd17d2b4f4f80b8fb97f5716261f77
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-07-17 12:24:33 +00:00
Tim Jenssen
52316578f8 qml: introduce QmlMultiLanguageAspect
This aspect is only available if the special multilanguage
plugin is available.
Translation changes in that plugin changes this aspect,
which results in environment variables which activate the use
of a multilanguage created sqlite to provide the translations.

Change-Id: I38250b69165eb7ec3e4f82dc34b3cc4ba0a33f8f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-18 13:02:37 +00:00