Use the full module uri for the class export macro

Using the full uri makes it more unlikely that the export macro names
clash with the export macro of an library with the same name.

Task-number: AUTOSUITE-509
Change-Id: If5d66f7dc4d7e3e8edc4cbede1d2dfcbaad3b1d7
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>

13 files changed, 13 insertions, 13 deletions

diff --git a/examples/ivicore/qface-ivi-climate/frontend/frontend.pro b/examples/ivicore/qface-ivi-climate/frontend/frontend.pro
index fb07a8a..f76702e 100644
--- a/examples/ivicore/qface-ivi-climate/frontend/frontend.pro
+++ b/examples/ivicore/qface-ivi-climate/frontend/frontend.pro
@@ -8,7 +8,7 @@ QT_FOR_CONFIG += ivicore
 #! [0]
 QT += ivicore ivicore-private qml quick
 
-DEFINES += QT_BUILD_CLIMATE_LIB
+DEFINES += QT_BUILD_EXAMPLE_IVI_CLIMATE_LIB
 #! [1]
 CONFIG += ivigenerator
 QFACE_SOURCES = ../example-ivi-climate.qface
diff --git a/examples/ivicore/qface-ivi-remote/frontend/frontend.pro b/examples/ivicore/qface-ivi-remote/frontend/frontend.pro
index 20e5207..8fe5732 100644
--- a/examples/ivicore/qface-ivi-remote/frontend/frontend.pro
+++ b/examples/ivicore/qface-ivi-remote/frontend/frontend.pro
@@ -8,7 +8,7 @@ QT_FOR_CONFIG += ivicore
 #! [0]
 QT += ivicore ivicore-private qml quick
 
-DEFINES += QT_BUILD_REMOTE_LIB
+DEFINES += QT_BUILD_EXAMPLE_IVI_REMOTE_LIB
 #! [1]
 CONFIG += ivigenerator
 QFACE_SOURCES = ../example-ivi-remote.qface
diff --git a/src/tools/ivigenerator/templates_frontend/backendinterface.h.tpl b/src/tools/ivigenerator/templates_frontend/backendinterface.h.tpl
index 83aeb58..ae01f1c 100644
--- a/src/tools/ivigenerator/templates_frontend/backendinterface.h.tpl
+++ b/src/tools/ivigenerator/templates_frontend/backendinterface.h.tpl
@@ -44,7 +44,7 @@
 {%   set base_class = 'QIviFeatureInterface' %}
 {% endif %}
 {% set oncedefine = '{0}_{1}_H_'.format(module.module_name|upper, class|upper) %}
-{% set exportsymbol = 'Q_{0}_EXPORT'.format(module.module_name|upper) %}
+{% set exportsymbol = 'Q_{0}_EXPORT'.format(module|upper|replace('.', '_')) %}
 {% include 'generated_comment.cpp.tpl' %}
 
 #ifndef {{oncedefine}}
diff --git a/src/tools/ivigenerator/templates_frontend/global.h.tpl b/src/tools/ivigenerator/templates_frontend/global.h.tpl
index a98c1ae..e12ea36 100644
--- a/src/tools/ivigenerator/templates_frontend/global.h.tpl
+++ b/src/tools/ivigenerator/templates_frontend/global.h.tpl
@@ -36,7 +36,7 @@
 #
 # SPDX-License-Identifier: LGPL-3.0
 #}
-{% set exportsymbol = '{0}'.format(module.module_name|upper) %}
+{% set exportsymbol = '{0}'.format(module|upper|replace('.', '_')) %}
 {% set oncedefine = '{0}GLOBAL_H_'.format(exportsymbol) %}
 {% include 'generated_comment.cpp.tpl' %}
 
diff --git a/src/tools/ivigenerator/templates_frontend/interface.h.tpl b/src/tools/ivigenerator/templates_frontend/interface.h.tpl
index 6db880a..a68fa31 100644
--- a/src/tools/ivigenerator/templates_frontend/interface.h.tpl
+++ b/src/tools/ivigenerator/templates_frontend/interface.h.tpl
@@ -44,7 +44,7 @@
 {%   set base_class = 'QIviAbstractFeature' %}
 {% endif %}
 {% set oncedefine = '{0}_{1}_H_'.format(module.module_name|upper, class|upper) %}
-{% set exportsymbol = 'Q_{0}_EXPORT'.format(module.module_name|upper) %}
+{% set exportsymbol = 'Q_{0}_EXPORT'.format(module|upper|replace('.', '_')) %}
 {% include 'generated_comment.cpp.tpl' %}
 
 #ifndef {{oncedefine}}
diff --git a/src/tools/ivigenerator/templates_frontend/module.h.tpl b/src/tools/ivigenerator/templates_frontend/module.h.tpl
index 12c1dcb..4e3e540 100644
--- a/src/tools/ivigenerator/templates_frontend/module.h.tpl
+++ b/src/tools/ivigenerator/templates_frontend/module.h.tpl
@@ -36,7 +36,7 @@
 #
 # SPDX-License-Identifier: LGPL-3.0
 #}
-{% set exportsymbol = 'Q_{0}_EXPORT'.format(module.module_name|upper) %}
+{% set exportsymbol = 'Q_{0}_EXPORT'.format(module|upper|replace('.', '_')) %}
 {% set class = '{0}Module'.format(module.module_name|upperfirst) %}
 {% set oncedefine = '{0}_H_'.format(class|upper) %}
 {% include 'generated_comment.cpp.tpl' %}
diff --git a/src/tools/ivigenerator/templates_frontend/modulefactory.h.tpl b/src/tools/ivigenerator/templates_frontend/modulefactory.h.tpl
index a4c3274..02736d8 100644
--- a/src/tools/ivigenerator/templates_frontend/modulefactory.h.tpl
+++ b/src/tools/ivigenerator/templates_frontend/modulefactory.h.tpl
@@ -36,7 +36,7 @@
 #
 # SPDX-License-Identifier: LGPL-3.0
 #}
-{% set exportsymbol = 'Q_{0}_EXPORT'.format(module.module_name|upper) %}
+{% set exportsymbol = 'Q_{0}_EXPORT'.format(module|upper|replace('.', '_')) %}
 {% set class = '{0}ModuleFactory'.format(module.module_name|upperfirst) %}
 {% set oncedefine = '{0}_H_'.format(class|upper) %}
 {% include 'generated_comment.cpp.tpl' %}
diff --git a/src/tools/ivigenerator/templates_frontend/struct.h.tpl b/src/tools/ivigenerator/templates_frontend/struct.h.tpl
index 5eda736..e21ce93 100644
--- a/src/tools/ivigenerator/templates_frontend/struct.h.tpl
+++ b/src/tools/ivigenerator/templates_frontend/struct.h.tpl
@@ -40,7 +40,7 @@
 {% import 'qtivi_macros.j2' as ivi %}
 {% set class = '{0}'.format(struct) %}
 {% set oncedefine = '{0}_{1}_H_'.format(module.module_name|upper, class|upper) %}
-{% set exportsymbol = 'Q_{0}_EXPORT'.format(module.module_name|upper) %}
+{% set exportsymbol = 'Q_{0}_EXPORT'.format(module|upper|replace('.', '_')) %}
 {% include 'generated_comment.cpp.tpl' %}
 
 #ifndef {{oncedefine}}
diff --git a/src/tools/ivigenerator/templates_frontend/structmodel.h.tpl b/src/tools/ivigenerator/templates_frontend/structmodel.h.tpl
index 24ca9a3..8d98add 100644
--- a/src/tools/ivigenerator/templates_frontend/structmodel.h.tpl
+++ b/src/tools/ivigenerator/templates_frontend/structmodel.h.tpl
@@ -39,7 +39,7 @@
 #}
 {% set class = '{0}Model'.format(struct) %}
 {% set oncedefine = '{0}_{1}_H_'.format(module.module_name|upper, class|upper) %}
-{% set exportsymbol = 'Q_{0}_EXPORT'.format(module.module_name|upper) %}
+{% set exportsymbol = 'Q_{0}_EXPORT'.format(module|upper|replace('.', '_')) %}
 {% include 'generated_comment.cpp.tpl' %}
 
 #ifndef {{oncedefine}}
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/frontend/frontend.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/frontend/frontend.pro
index 6d81dbd..7e2c7aa 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/frontend/frontend.pro
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/frontend/frontend.pro
@@ -6,7 +6,7 @@ CONFIG += ivigenerator
 
 QT += ivicore ivicore-private qml quick
 
-DEFINES += QT_BUILD_ECHO_LIB
+DEFINES += QT_BUILD_ORG_EXAMPLE_ECHO_LIB
 
 macos: QMAKE_SONAME_PREFIX = @rpath
 
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/frontend/frontend.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/frontend/frontend.pro
index f515c5a..0754145 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/frontend/frontend.pro
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/frontend/frontend.pro
@@ -6,7 +6,7 @@ CONFIG += ivigenerator
 
 QT += ivicore ivicore-private qml quick
 
-DEFINES += QT_BUILD_ECHO_LIB
+DEFINES += QT_BUILD_ORG_EXAMPLE_ECHO_LIB
 
 macos: QMAKE_SONAME_PREFIX = @rpath
 
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/frontend/frontend.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/frontend/frontend.pro
index 156a404..130ea15 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/frontend/frontend.pro
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/frontend/frontend.pro
@@ -6,7 +6,7 @@ CONFIG += ivigenerator
 
 QT += ivicore ivicore-private qml quick
 
-DEFINES += QT_BUILD_ECHO_LIB
+DEFINES += QT_BUILD_ORG_EXAMPLE_SIMULATOR_ECHO_LIB
 
 macos: QMAKE_SONAME_PREFIX = @rpath
 
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo/frontend/frontend.pro b/tests/auto/core/ivigenerator/projects/org-example-echo/frontend/frontend.pro
index af958af..703e74a 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo/frontend/frontend.pro
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo/frontend/frontend.pro
@@ -6,7 +6,7 @@ CONFIG += ivigenerator
 
 QT += ivicore ivicore-private qml quick
 
-DEFINES += QT_BUILD_ECHO_LIB
+DEFINES += QT_BUILD_ORG_EXAMPLE_ECHO_LIB
 
 macos: QMAKE_SONAME_PREFIX = @rpath