From c82402e158100d1c755bdcbaab731952ad487821 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Fri, 12 Feb 2016 16:23:59 +0100
Subject: consistently put {qt,qml}_{module,plugin} at the end of project files

this fixes static builds by ensuring that all dependencies are exported.

Task-number: QTBUG-51071
Change-Id: I8e1554b648327ea2fb342b882ce8e439bd6f271d
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
---
 .../mockserviceplugin1/mockserviceplugin1.pro              | 14 +++++++-------
 .../mockserviceplugin2/mockserviceplugin2.pro              | 14 +++++++-------
 .../mockserviceplugin3/mockserviceplugin3.pro              | 14 +++++++-------
 .../mockserviceplugin4/mockserviceplugin4.pro              | 14 +++++++-------
 .../mockserviceplugin5/mockserviceplugin5.pro              | 14 +++++++-------
 5 files changed, 35 insertions(+), 35 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
index 68dee28a9..2b7412d16 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
@@ -1,7 +1,13 @@
 TARGET = mockserviceplugin1
 QT += multimedia-private
 
-PLUGIN_TYPE=mediaservice
+HEADERS += ../mockservice.h
+SOURCES += mockserviceplugin1.cpp
+OTHER_FILES += mockserviceplugin1.json
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = mediaservice
 PLUGIN_CLASS_NAME = MockServicePlugin1
 load(qt_plugin)
 
@@ -14,10 +20,4 @@ win32 {
     }
 }
 
-HEADERS += ../mockservice.h
-SOURCES += mockserviceplugin1.cpp
-OTHER_FILES += mockserviceplugin1.json
-
 target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
index 98a3ca4a4..ff793ec85 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
@@ -1,7 +1,13 @@
 TARGET = mockserviceplugin2
 QT += multimedia-private
 
-PLUGIN_TYPE=mediaservice
+HEADERS += ../mockservice.h
+SOURCES += mockserviceplugin2.cpp
+OTHER_FILES += mockserviceplugin2.json
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = mediaservice
 PLUGIN_CLASS_NAME = MockServicePlugin2
 load(qt_plugin)
 
@@ -14,10 +20,4 @@ win32 {
     }
 }
 
-HEADERS += ../mockservice.h
-SOURCES += mockserviceplugin2.cpp
-OTHER_FILES += mockserviceplugin2.json
-
 target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
index 50def293f..15e9dc659 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
@@ -1,7 +1,13 @@
 TARGET = mockserviceplugin3
 QT += multimedia-private
 
-PLUGIN_TYPE=mediaservice
+HEADERS += ../mockservice.h
+SOURCES += mockserviceplugin3.cpp
+OTHER_FILES += mockserviceplugin3.json
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = mediaservice
 PLUGIN_CLASS_NAME = MockServicePlugin3
 load(qt_plugin)
 
@@ -14,10 +20,4 @@ win32 {
     }
 }
 
-HEADERS += ../mockservice.h
-SOURCES += mockserviceplugin3.cpp
-OTHER_FILES += mockserviceplugin3.json
-
 target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
index 57b715f52..894d92939 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
@@ -1,7 +1,13 @@
 TARGET = mockserviceplugin4
 QT += multimedia-private
 
-PLUGIN_TYPE=mediaservice
+HEADERS += ../mockservice.h
+SOURCES += mockserviceplugin4.cpp
+OTHER_FILES += mockserviceplugin4.json
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = mediaservice
 PLUGIN_CLASS_NAME = MockServicePlugin4
 load(qt_plugin)
 
@@ -14,10 +20,4 @@ win32 {
     }
 }
 
-HEADERS += ../mockservice.h
-SOURCES += mockserviceplugin4.cpp
-OTHER_FILES += mockserviceplugin4.json
-
 target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro
index 9657e3cc1..093c24746 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro
@@ -1,7 +1,13 @@
 TARGET = mockserviceplugin5
 QT += multimedia-private
 
-PLUGIN_TYPE=mediaservice
+HEADERS += ../mockservice.h
+SOURCES += mockserviceplugin5.cpp
+OTHER_FILES += mockserviceplugin5.json
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = mediaservice
 PLUGIN_CLASS_NAME = MockServicePlugin5
 load(qt_plugin)
 
@@ -14,10 +20,4 @@ win32 {
     }
 }
 
-HEADERS += ../mockservice.h
-SOURCES += mockserviceplugin5.cpp
-OTHER_FILES += mockserviceplugin5.json
-
 target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
-- 
cgit v1.2.3