Merge remote-tracking branch 'origin/5.9' into dev

Change-Id: Ifa81cd2a44e492204c19e395300cd0e95cbebe92

1 files changed, 10 insertions, 6 deletions

diff --git a/src/tools/ivigenerator/generate.py b/src/tools/ivigenerator/generate.py
index acf0ee2..7ef5f80 100755
--- a/src/tools/ivigenerator/generate.py
+++ b/src/tools/ivigenerator/generate.py
@@ -90,7 +90,7 @@ def conf_sim_tag(symbol, path, default_value=False):
 
 def enum_value_to_cppliteral(value, module_name):
     value = value.strip().rsplit('.', 1)[-1]
-    return '{0}{1}Module::{2}'.format(Filters.classPrefix, module_name, value)
+    return '{0}{1}Module::{2}'.format(Filters.classPrefix, upper_first(module_name), value)
 
 
 def enum_value(value, module_name):
@@ -120,7 +120,7 @@ def default_type_value(symbol):
     elif t.is_enum:
         module_name = t.reference.module.module_name
         value = next(iter(t.reference.members))
-        return '{0}{1}Module::{2}'.format(prefix, module_name, value)
+        return '{0}{1}Module::{2}'.format(prefix, upper_first(module_name), value)
     elif t.is_flag:
         return '0'
     elif symbol.type.is_list:
@@ -154,11 +154,11 @@ def test_type_value(symbol):
     elif t.is_enum:
         module_name = t.reference.module.module_name
         value = list(iter(t.reference.members))[-1]
-        return '{0}{1}Module::{2}'.format(prefix, module_name, value)
+        return '{0}{1}Module::{2}'.format(prefix, upper_first(module_name), value)
     elif t.is_flag:
         module_name = t.reference.module.module_name
         value = next(iter(t.reference.members))
-        return '{0}{1}Module::{2}'.format(prefix, module_name, value)
+        return '{0}{1}Module::{2}'.format(prefix, upper_first(module_name), value)
     elif symbol.type.is_list:
         return 'QVariantList({})'
     elif symbol.type.is_struct:
@@ -205,7 +205,7 @@ def parameter_type(symbol):
     """
     prefix = Filters.classPrefix
     if symbol.type.is_enum or symbol.type.is_flag:
-        return '{0}{1}Module::{2} {3}'.format(prefix, symbol.module.module_name, flag_type(symbol), symbol)
+        return '{0}{1}Module::{2} {3}'.format(prefix, upper_first(symbol.module.module_name), flag_type(symbol), symbol)
     if symbol.type.is_void or symbol.type.is_primitive:
         if symbol.type.name == 'string':
             return 'const QString &{0}'.format(symbol)
@@ -234,7 +234,7 @@ def return_type(symbol):
     """
     prefix = Filters.classPrefix
     if symbol.type.is_enum or symbol.type.is_flag:
-        return('{0}{1}Module::{2}'.format(prefix, symbol.module.module_name, flag_type(symbol)))
+        return('{0}{1}Module::{2}'.format(prefix, upper_first(symbol.module.module_name), flag_type(symbol)))
     if symbol.type.is_void or symbol.type.is_primitive:
         if symbol.type.name == 'string':
             return 'QString'
@@ -380,6 +380,10 @@ def lower_first_filter(s):
     s = str(s)
     return s[0].lower() + s[1:]
 
+def upper_first(s):
+    s = str(s)
+    return s[0].upper() + s[1:]
+
 def qml_control_properties(symbol, backend_object):
     """
     Returns properties of the QML control matching to this