summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@qt.io>2019-11-28 15:46:39 +0100
committerDominik Holland <dominik.holland@qt.io>2019-11-29 15:09:25 +0100
commit49e2046ef031b35fa7cb38e53cdaee36d3a2831e (patch)
tree5fcbed74a53135a847ab275fdc75d04ad27ab471 /tests
parenta4f32253e7b19ba97aefb82d11330eeb0379b68d (diff)
downloadqtivi-49e2046ef031b35fa7cb38e53cdaee36d3a2831e.tar.gz
ivigenerator: Use QStringLiterals for string default_values
For default_values in our simulation backends, QLatin1String() were generated so far, but when using these for initializing a struct with only one string property, this caused problems, as the structs are using QStrings and because of an additional QVariant constructor this caused some ambiguity for the compiler. Switching to QStringLiterals fixes this problem, as the QString constructor is used in this case. Change-Id: Iae34ef290ec5683665fdfdb75b633e748ee371f3 Fixes: AUTOSUITE-1340 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/core/ivigenerator/org.example.echo.qface8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/core/ivigenerator/org.example.echo.qface b/tests/auto/core/ivigenerator/org.example.echo.qface
index 17a519c..faed373 100644
--- a/tests/auto/core/ivigenerator/org.example.echo.qface
+++ b/tests/auto/core/ivigenerator/org.example.echo.qface
@@ -34,6 +34,9 @@ interface Echo {
WeekDay weekDay;
TestEnum testEnum;
real UPPERCASEPROPERTY;
+ /* AUTOSUITE-1340 */
+ @config_simulator: { default: ["Hello Qt"] }
+ OnlyAStringInAStruct stringInAStructProperty;
string echo(string msg);
string id() const;
@@ -144,3 +147,8 @@ struct Combo {
struct AnotherStruct {
int justANumber;
}
+
+/* AUTOSUITE-1340 */
+struct OnlyAStringInAStruct {
+ string myString;
+}