From 8c39b4c05fecf1e0c1713c19b5e077c47e881846 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 24 Oct 2012 14:00:12 +0200 Subject: beef up qt_plugin.prf it now defines the DESTDIR and creates an INSTALLS rule. Change-Id: I15a462ccad9acbe3521c352fa98327825dc27c05 Reviewed-by: Joerg Bornemann --- src/plugins/bearer/blackberry/blackberry.pro | 6 ++---- src/plugins/bearer/connman/connman.pro | 6 ++---- src/plugins/bearer/corewlan/corewlan.pro | 6 ++---- src/plugins/bearer/generic/generic.pro | 6 ++---- src/plugins/bearer/nativewifi/nativewifi.pro | 6 ++---- src/plugins/bearer/networkmanager/networkmanager.pro | 6 ++---- src/plugins/bearer/nla/nla.pro | 6 ++---- 7 files changed, 14 insertions(+), 28 deletions(-) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/blackberry/blackberry.pro b/src/plugins/bearer/blackberry/blackberry.pro index 5d4cf29554..220a506d90 100644 --- a/src/plugins/bearer/blackberry/blackberry.pro +++ b/src/plugins/bearer/blackberry/blackberry.pro @@ -1,4 +1,6 @@ TARGET = qbbbearer + +PLUGIN_TYPE = bearer load(qt_plugin) QT = core-private network-private @@ -15,7 +17,3 @@ SOURCES += qbbengine.cpp \ main.cpp OTHER_FILES += blackberry.json - -DESTDIR = $$QT.network.plugins/bearer -target.path += $$[QT_INSTALL_PLUGINS]/bearer -INSTALLS += target diff --git a/src/plugins/bearer/connman/connman.pro b/src/plugins/bearer/connman/connman.pro index 679637b37f..99d9b367f2 100644 --- a/src/plugins/bearer/connman/connman.pro +++ b/src/plugins/bearer/connman/connman.pro @@ -1,4 +1,6 @@ TARGET = qconnmanbearer + +PLUGIN_TYPE = bearer load(qt_plugin) QT = core network-private dbus @@ -17,7 +19,3 @@ SOURCES += main.cpp \ OTHER_FILES += connman.json -DESTDIR = $$QT.network.plugins/bearer -target.path += $$[QT_INSTALL_PLUGINS]/bearer -INSTALLS += target - diff --git a/src/plugins/bearer/corewlan/corewlan.pro b/src/plugins/bearer/corewlan/corewlan.pro index b60dac907c..481b75c8ab 100644 --- a/src/plugins/bearer/corewlan/corewlan.pro +++ b/src/plugins/bearer/corewlan/corewlan.pro @@ -1,4 +1,6 @@ TARGET = qcorewlanbearer + +PLUGIN_TYPE = bearer load(qt_plugin) QT = core-private network-private @@ -20,7 +22,3 @@ 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/generic/generic.pro b/src/plugins/bearer/generic/generic.pro index e66c5b2c7a..a1da0dddda 100644 --- a/src/plugins/bearer/generic/generic.pro +++ b/src/plugins/bearer/generic/generic.pro @@ -1,4 +1,6 @@ TARGET = qgenericbearer + +PLUGIN_TYPE = bearer load(qt_plugin) QT = core-private network-private @@ -12,7 +14,3 @@ SOURCES += qgenericengine.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/nativewifi/nativewifi.pro b/src/plugins/bearer/nativewifi/nativewifi.pro index 3124d58ff2..4382cd08cd 100644 --- a/src/plugins/bearer/nativewifi/nativewifi.pro +++ b/src/plugins/bearer/nativewifi/nativewifi.pro @@ -1,4 +1,6 @@ TARGET = qnativewifibearer + +PLUGIN_TYPE = bearer load(qt_plugin) QT = core-private network-private @@ -13,7 +15,3 @@ SOURCES += main.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/networkmanager.pro b/src/plugins/bearer/networkmanager/networkmanager.pro index c1c6664897..4f299e22f2 100644 --- a/src/plugins/bearer/networkmanager/networkmanager.pro +++ b/src/plugins/bearer/networkmanager/networkmanager.pro @@ -1,4 +1,6 @@ TARGET = qnmbearer + +PLUGIN_TYPE = bearer load(qt_plugin) QT = core network-private dbus @@ -16,7 +18,3 @@ SOURCES += main.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/nla.pro b/src/plugins/bearer/nla/nla.pro index 29e98953b1..56c06a57b1 100644 --- a/src/plugins/bearer/nla/nla.pro +++ b/src/plugins/bearer/nla/nla.pro @@ -1,4 +1,6 @@ TARGET = qnlabearer + +PLUGIN_TYPE = bearer load(qt_plugin) QT = core core-private network network-private @@ -19,7 +21,3 @@ SOURCES += main.cpp \ ../qnetworksession_impl.cpp OTHER_FILES += nla.json - -DESTDIR = $$QT.network.plugins/bearer -target.path += $$[QT_INSTALL_PLUGINS]/bearer -INSTALLS += target -- cgit v1.2.3