diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2018-09-26 10:10:43 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2018-09-27 09:33:45 +0200 |
| commit | 6f96b2b3b985f1233302385db328e2aa67b95fb9 (patch) | |
| tree | 19caa35f592c7fb37e8f1bf63fdd2b5435c5ee45 /tests | |
| parent | 142d7174863c2acf2792ba723c8dd273f8d07b22 (diff) | |
| parent | c3da57cf0c7213120803fe63003d0cc14d14f871 (diff) | |
| download | qtivi-6f96b2b3b985f1233302385db328e2aa67b95fb9.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: If48055bb577b4b59a836b2c4a00d940401b97c6a
Diffstat (limited to 'tests')
4 files changed, 4 insertions, 4 deletions
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 |