Merge master -> api_changes

Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.

Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827

18 files changed, 61 insertions, 19 deletions

diff --git a/src/plugins/bearer/connman/connman.json b/src/plugins/bearer/connman/connman.json
new file mode 100644
index 0000000000..7a80b8c9be
--- /dev/null
+++ b/src/plugins/bearer/connman/connman.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "connman" ]
+}
diff --git a/src/plugins/bearer/connman/connman.pro b/src/plugins/bearer/connman/connman.pro
index 25243f8e0a..679637b37f 100644
--- a/src/plugins/bearer/connman/connman.pro
+++ b/src/plugins/bearer/connman/connman.pro
@@ -15,6 +15,8 @@ SOURCES += main.cpp \
            qconnmanengine.cpp \
            ../qnetworksession_impl.cpp
 
+OTHER_FILES += connman.json
+
 DESTDIR = $$QT.network.plugins/bearer
 target.path += $$[QT_INSTALL_PLUGINS]/bearer
 INSTALLS += target
diff --git a/src/plugins/bearer/connman/main.cpp b/src/plugins/bearer/connman/main.cpp
index f612f0ca9f..be934c7282 100644
--- a/src/plugins/bearer/connman/main.cpp
+++ b/src/plugins/bearer/connman/main.cpp
@@ -51,6 +51,9 @@ QT_BEGIN_NAMESPACE
 
 class QConnmanEnginePlugin : public QBearerEnginePlugin
 {
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QBearerEngineFactoryInterface" FILE "connman.json")
+
 public:
     QConnmanEnginePlugin();
     ~QConnmanEnginePlugin();
@@ -84,10 +87,9 @@ QBearerEngine *QConnmanEnginePlugin::create(const QString &key) const
     return 0;
 }
 
-Q_EXPORT_STATIC_PLUGIN(QConnmanEnginePlugin)
-Q_EXPORT_PLUGIN2(qconnmanbearer, QConnmanEnginePlugin)
-
 QT_END_NAMESPACE
 
+#include "main.moc"
+
 #endif
 #endif // QT_NO_BEARERMANAGEMENT
diff --git a/src/plugins/bearer/corewlan/corewlan.json b/src/plugins/bearer/corewlan/corewlan.json
new file mode 100644
index 0000000000..b43519ea90
--- /dev/null
+++ b/src/plugins/bearer/corewlan/corewlan.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "corewlan" ]
+}
diff --git a/src/plugins/bearer/corewlan/corewlan.pro b/src/plugins/bearer/corewlan/corewlan.pro
index 6a214ac340..82a514fb14 100644
--- a/src/plugins/bearer/corewlan/corewlan.pro
+++ b/src/plugins/bearer/corewlan/corewlan.pro
@@ -19,6 +19,8 @@ SOURCES += main.cpp \
 
 OBJECTIVE_SOURCES += qcorewlanengine.mm
 
+OTHER_FILES += corewlan.json
+
 DESTDIR = $$QT.network.plugins/bearer
 target.path += $$[QT_INSTALL_PLUGINS]/bearer
 INSTALLS += target
diff --git a/src/plugins/bearer/corewlan/main.cpp b/src/plugins/bearer/corewlan/main.cpp
index 0f5ad2c7fb..f2ba8bd879 100644
--- a/src/plugins/bearer/corewlan/main.cpp
+++ b/src/plugins/bearer/corewlan/main.cpp
@@ -51,6 +51,9 @@ QT_BEGIN_NAMESPACE
 
 class QCoreWlanEnginePlugin : public QBearerEnginePlugin
 {
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QBearerEngineFactoryInterface" FILE "corewlan.json")
+
 public:
     QCoreWlanEnginePlugin();
     ~QCoreWlanEnginePlugin();
@@ -80,9 +83,8 @@ QBearerEngine *QCoreWlanEnginePlugin::create(const QString &key) const
         return 0;
 }
 
-Q_EXPORT_STATIC_PLUGIN(QCoreWlanEnginePlugin)
-Q_EXPORT_PLUGIN2(qcorewlanbearer, QCoreWlanEnginePlugin)
-
 QT_END_NAMESPACE
 
+#include "main.moc"
+
 #endif // QT_NO_BEARERMANAGEMENT
diff --git a/src/plugins/bearer/generic/generic.json b/src/plugins/bearer/generic/generic.json
new file mode 100644
index 0000000000..e9357f4c72
--- /dev/null
+++ b/src/plugins/bearer/generic/generic.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "generic" ]
+}
diff --git a/src/plugins/bearer/generic/generic.pro b/src/plugins/bearer/generic/generic.pro
index 4f86c2a38c..e66c5b2c7a 100644
--- a/src/plugins/bearer/generic/generic.pro
+++ b/src/plugins/bearer/generic/generic.pro
@@ -11,6 +11,8 @@ SOURCES += qgenericengine.cpp \
            ../qnetworksession_impl.cpp \
            main.cpp
 
+OTHER_FILES += generic.json
+
 DESTDIR = $$QT.network.plugins/bearer
 target.path += $$[QT_INSTALL_PLUGINS]/bearer
 INSTALLS += target
diff --git a/src/plugins/bearer/generic/main.cpp b/src/plugins/bearer/generic/main.cpp
index 0311bcbef0..5f5ad7c238 100644
--- a/src/plugins/bearer/generic/main.cpp
+++ b/src/plugins/bearer/generic/main.cpp
@@ -51,6 +51,9 @@ QT_BEGIN_NAMESPACE
 
 class QGenericEnginePlugin : public QBearerEnginePlugin
 {
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QBearerEngineFactoryInterface" FILE "generic.json")
+
 public:
     QGenericEnginePlugin();
     ~QGenericEnginePlugin();
@@ -80,9 +83,8 @@ QBearerEngine *QGenericEnginePlugin::create(const QString &key) const
         return 0;
 }
 
-Q_EXPORT_STATIC_PLUGIN(QGenericEnginePlugin)
-Q_EXPORT_PLUGIN2(qgenericbearer, QGenericEnginePlugin)
-
 QT_END_NAMESPACE
 
+#include "main.moc"
+
 #endif // QT_NO_BEARERMANAGEMENT
diff --git a/src/plugins/bearer/nativewifi/main.cpp b/src/plugins/bearer/nativewifi/main.cpp
index 74129c1d0a..8baa977a9d 100644
--- a/src/plugins/bearer/nativewifi/main.cpp
+++ b/src/plugins/bearer/nativewifi/main.cpp
@@ -92,6 +92,9 @@ static void resolveLibrary()
 
 class QNativeWifiEnginePlugin : public QBearerEnginePlugin
 {
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QBearerEngineFactoryInterface" FILE "nativewifi.json")
+
 public:
     QNativeWifiEnginePlugin();
     ~QNativeWifiEnginePlugin();
@@ -135,9 +138,8 @@ QBearerEngine *QNativeWifiEnginePlugin::create(const QString &key) const
     return engine;
 }
 
-Q_EXPORT_STATIC_PLUGIN(QNativeWifiEnginePlugin)
-Q_EXPORT_PLUGIN2(qnativewifibearer, QNativeWifiEnginePlugin)
-
 QT_END_NAMESPACE
 
+#include "main.moc"
+
 #endif // QT_NO_BEARERMANAGEMENT
diff --git a/src/plugins/bearer/nativewifi/nativewifi.json b/src/plugins/bearer/nativewifi/nativewifi.json
new file mode 100644
index 0000000000..f3db199150
--- /dev/null
+++ b/src/plugins/bearer/nativewifi/nativewifi.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "nativewifi" ]
+}
diff --git a/src/plugins/bearer/nativewifi/nativewifi.pro b/src/plugins/bearer/nativewifi/nativewifi.pro
index ec86cc0b93..3124d58ff2 100644
--- a/src/plugins/bearer/nativewifi/nativewifi.pro
+++ b/src/plugins/bearer/nativewifi/nativewifi.pro
@@ -12,6 +12,8 @@ SOURCES += main.cpp \
            qnativewifiengine.cpp \
            ../qnetworksession_impl.cpp
 
+OTHER_FILES += nativewifi.json
+
 DESTDIR = $$QT.network.plugins/bearer
 target.path += $$[QT_INSTALL_PLUGINS]/bearer
 INSTALLS += target
diff --git a/src/plugins/bearer/networkmanager/main.cpp b/src/plugins/bearer/networkmanager/main.cpp
index 2278d221fd..c8a8a74e46 100644
--- a/src/plugins/bearer/networkmanager/main.cpp
+++ b/src/plugins/bearer/networkmanager/main.cpp
@@ -52,6 +52,9 @@ QT_BEGIN_NAMESPACE
 
 class QNetworkManagerEnginePlugin : public QBearerEnginePlugin
 {
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QBearerEngineFactoryInterface" FILE "networkmanager.json")
+
 public:
     QNetworkManagerEnginePlugin();
     ~QNetworkManagerEnginePlugin();
@@ -86,10 +89,9 @@ QBearerEngine *QNetworkManagerEnginePlugin::create(const QString &key) const
     return 0;
 }
 
-Q_EXPORT_STATIC_PLUGIN(QNetworkManagerEnginePlugin)
-Q_EXPORT_PLUGIN2(qnmbearer, QNetworkManagerEnginePlugin)
-
 QT_END_NAMESPACE
 
+#include "main.moc"
+
 #endif // QT_NO_DBUS
 #endif // QT_NO_BEARERMANAGEMENT
diff --git a/src/plugins/bearer/networkmanager/networkmanager.json b/src/plugins/bearer/networkmanager/networkmanager.json
new file mode 100644
index 0000000000..3d408d5c20
--- /dev/null
+++ b/src/plugins/bearer/networkmanager/networkmanager.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "networkmanager" ]
+}
diff --git a/src/plugins/bearer/networkmanager/networkmanager.pro b/src/plugins/bearer/networkmanager/networkmanager.pro
index 262f60a69c..c1c6664897 100644
--- a/src/plugins/bearer/networkmanager/networkmanager.pro
+++ b/src/plugins/bearer/networkmanager/networkmanager.pro
@@ -15,6 +15,8 @@ SOURCES += main.cpp \
            qnetworkmanagerengine.cpp \
            ../qnetworksession_impl.cpp
 
+OTHER_FILES += networkmanager.json
+
 DESTDIR = $$QT.network.plugins/bearer
 target.path += $$[QT_INSTALL_PLUGINS]/bearer
 INSTALLS += target
diff --git a/src/plugins/bearer/nla/main.cpp b/src/plugins/bearer/nla/main.cpp
index 4337c1748a..4a2c915d13 100644
--- a/src/plugins/bearer/nla/main.cpp
+++ b/src/plugins/bearer/nla/main.cpp
@@ -49,6 +49,9 @@ QT_BEGIN_NAMESPACE
 
 class QNlaEnginePlugin : public QBearerEnginePlugin
 {
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QBearerEngineFactoryInterface" FILE "nla.json")
+
 public:
     QNlaEnginePlugin();
     ~QNlaEnginePlugin();
@@ -78,7 +81,6 @@ QBearerEngine *QNlaEnginePlugin::create(const QString &key) const
         return 0;
 }
 
-Q_EXPORT_STATIC_PLUGIN(QNlaEnginePlugin)
-Q_EXPORT_PLUGIN2(qnlabearer, QNlaEnginePlugin)
-
 QT_END_NAMESPACE
+
+#include "main.moc"
diff --git a/src/plugins/bearer/nla/nla.json b/src/plugins/bearer/nla/nla.json
new file mode 100644
index 0000000000..2554d2c5c4
--- /dev/null
+++ b/src/plugins/bearer/nla/nla.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "nla" ]
+}
diff --git a/src/plugins/bearer/nla/nla.pro b/src/plugins/bearer/nla/nla.pro
index 76da098dbf..5444269f1f 100644
--- a/src/plugins/bearer/nla/nla.pro
+++ b/src/plugins/bearer/nla/nla.pro
@@ -1,7 +1,7 @@
 TARGET = qnlabearer
 load(qt_plugin)
 
-QT = core network
+QT = core core-private network network-private
 
 !wince* {
     LIBS += -lWs2_32
@@ -18,6 +18,8 @@ SOURCES += main.cpp \
            qnlaengine.cpp \
            ../qnetworksession_impl.cpp
 
+OTHER_FILES += nla.json
+
 DESTDIR = $$QT.network.plugins/bearer
 target.path += $$[QT_INSTALL_PLUGINS]/bearer
 INSTALLS += target