From 1126485a575f2934415b96570f53899e29b18e32 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 12 Feb 2019 15:16:42 +0100 Subject: cmake: Build the generic bearer plugin Change-Id: I3ab356e23e22499be98a626d043e2cfb9fc51105 Reviewed-by: Liang Qi --- src/plugins/bearer/CMakeLists.txt | 9 +++++++++ src/plugins/bearer/generic/CMakeLists.txt | 29 +++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 src/plugins/bearer/CMakeLists.txt create mode 100644 src/plugins/bearer/generic/CMakeLists.txt (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/CMakeLists.txt b/src/plugins/bearer/CMakeLists.txt new file mode 100644 index 0000000000..d6720eec33 --- /dev/null +++ b/src/plugins/bearer/CMakeLists.txt @@ -0,0 +1,9 @@ +if (NOT ANDROID AND LINUX AND QT_FEATURE_dbus) + add_subdirectory(generic) +# TODO add_subdirectory(connman) +# TODO add_subdirectory(networkmanager) +elseif(ANDROID AND NOT ANDROID_EMBEDDED) +# TODO add_subdirectory(android) +else() + add_subdirectory(generic) +endif() diff --git a/src/plugins/bearer/generic/CMakeLists.txt b/src/plugins/bearer/generic/CMakeLists.txt new file mode 100644 index 0000000000..b275ddf01a --- /dev/null +++ b/src/plugins/bearer/generic/CMakeLists.txt @@ -0,0 +1,29 @@ +# Generated from generic.pro. + +##################################################################### +## qgenericbearer Plugin: +##################################################################### + +add_qt_plugin(qgenericbearer + TYPE bearer + SOURCES + ../platformdefs_win.h + ../qbearerengine_impl.h + ../qnetworksession_impl.cpp ../qnetworksession_impl.h + main.cpp + qgenericengine.cpp qgenericengine.h + LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate + # OTHER_FILES = "generic.json" + # PLUGIN_CLASS_NAME = "QGenericEnginePlugin" + # _LOADED = "qt_plugin" +) + +## Scopes: +##################################################################### + +extend_target(qgenericbearer CONDITION WIN32 AND NOT WINRT + LIBRARIES + iphlpapi +) -- cgit v1.2.3 From 8fdebd5e3732d4f7537a5dab92ea7a47a8f073ba Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 12 Feb 2019 15:18:06 +0100 Subject: cmake: build the connman bearer plugin Change-Id: I034ac995e231e7ad380ca9680e72037a573a1003 Reviewed-by: Liang Qi --- src/plugins/bearer/CMakeLists.txt | 2 +- src/plugins/bearer/connman/CMakeLists.txt | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 src/plugins/bearer/connman/CMakeLists.txt (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/CMakeLists.txt b/src/plugins/bearer/CMakeLists.txt index d6720eec33..e9e6275330 100644 --- a/src/plugins/bearer/CMakeLists.txt +++ b/src/plugins/bearer/CMakeLists.txt @@ -1,6 +1,6 @@ if (NOT ANDROID AND LINUX AND QT_FEATURE_dbus) add_subdirectory(generic) -# TODO add_subdirectory(connman) + add_subdirectory(connman) # TODO add_subdirectory(networkmanager) elseif(ANDROID AND NOT ANDROID_EMBEDDED) # TODO add_subdirectory(android) diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt new file mode 100644 index 0000000000..f2ad684602 --- /dev/null +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -0,0 +1,23 @@ +# Generated from connman.pro. + +##################################################################### +## qconnmanbearer Plugin: +##################################################################### + +add_qt_plugin(qconnmanbearer + TYPE bearer + SOURCES + ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h + ../qbearerengine_impl.h + ../qnetworksession_impl.cpp ../qnetworksession_impl.h + main.cpp + qconnmanengine.cpp qconnmanengine.h + qconnmanservice_linux.cpp qconnmanservice_linux_p.h + LIBRARIES + Qt::Core + Qt::NetworkPrivate + Qt::DBus + # OTHER_FILES = "connman.json" + # PLUGIN_CLASS_NAME = "QConnmanEnginePlugin" + # _LOADED = "qt_plugin" +) -- cgit v1.2.3 From 6424e70bbef492f052d1aa6b7ce36d5326625e6e Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 12 Feb 2019 15:21:58 +0100 Subject: cmake: compile the networkmanager bearer plugin Change-Id: Ia744afec6114266fcb693702db257fe36ba94b92 Reviewed-by: Liang Qi --- src/plugins/bearer/CMakeLists.txt | 2 +- src/plugins/bearer/networkmanager/CMakeLists.txt | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 src/plugins/bearer/networkmanager/CMakeLists.txt (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/CMakeLists.txt b/src/plugins/bearer/CMakeLists.txt index e9e6275330..ec860de2cb 100644 --- a/src/plugins/bearer/CMakeLists.txt +++ b/src/plugins/bearer/CMakeLists.txt @@ -1,7 +1,7 @@ if (NOT ANDROID AND LINUX AND QT_FEATURE_dbus) add_subdirectory(generic) add_subdirectory(connman) -# TODO add_subdirectory(networkmanager) + add_subdirectory(networkmanager) elseif(ANDROID AND NOT ANDROID_EMBEDDED) # TODO add_subdirectory(android) else() diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt new file mode 100644 index 0000000000..44323620d1 --- /dev/null +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -0,0 +1,23 @@ +# Generated from networkmanager.pro. + +##################################################################### +## qnmbearer Plugin: +##################################################################### + +add_qt_plugin(qnmbearer + TYPE bearer + SOURCES + ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h + ../qbearerengine_impl.h + ../qnetworksession_impl.cpp ../qnetworksession_impl.h + main.cpp + qnetworkmanagerengine.cpp qnetworkmanagerengine.h + qnetworkmanagerservice.cpp qnetworkmanagerservice.h + LIBRARIES + Qt::Core + Qt::NetworkPrivate + Qt::DBus + # OTHER_FILES = "networkmanager.json" + # PLUGIN_CLASS_NAME = "QNetworkManagerEnginePlugin" + # _LOADED = "qt_plugin" +) -- cgit v1.2.3 From 9e37f8844bc244b9ff5f99b82ccd6ee1dcb8ada8 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 29 Mar 2019 12:24:43 +0100 Subject: CMake: Re-generate plugins/bearer/generic Change-Id: I1962b813ab64ac7d577d8645239e9bd0f1140947 Reviewed-by: Albert Astals Cid --- src/plugins/bearer/generic/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/generic/CMakeLists.txt b/src/plugins/bearer/generic/CMakeLists.txt index b275ddf01a..822cd12b19 100644 --- a/src/plugins/bearer/generic/CMakeLists.txt +++ b/src/plugins/bearer/generic/CMakeLists.txt @@ -15,11 +15,13 @@ add_qt_plugin(qgenericbearer LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - # OTHER_FILES = "generic.json" - # PLUGIN_CLASS_NAME = "QGenericEnginePlugin" - # _LOADED = "qt_plugin" ) +#### Keys ignored in scope 1:.:generic.pro:: +# OTHER_FILES = "generic.json" +# PLUGIN_CLASS_NAME = "QGenericEnginePlugin" +# _LOADED = "qt_plugin" + ## Scopes: ##################################################################### -- cgit v1.2.3 From 107dc7568ecff168136fb59fcb9b72fcd6308215 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 29 Mar 2019 12:25:22 +0100 Subject: CMake: Re-generate plugins/bearer/connman Change-Id: I68f81b269573e2beaa7fce33adee9c090fae318a Reviewed-by: Albert Astals Cid --- src/plugins/bearer/connman/CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt index f2ad684602..08f286aee1 100644 --- a/src/plugins/bearer/connman/CMakeLists.txt +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -15,9 +15,11 @@ add_qt_plugin(qconnmanbearer qconnmanservice_linux.cpp qconnmanservice_linux_p.h LIBRARIES Qt::Core - Qt::NetworkPrivate Qt::DBus - # OTHER_FILES = "connman.json" - # PLUGIN_CLASS_NAME = "QConnmanEnginePlugin" - # _LOADED = "qt_plugin" + Qt::NetworkPrivate ) + +#### Keys ignored in scope 1:.:connman.pro:: +# OTHER_FILES = "connman.json" +# PLUGIN_CLASS_NAME = "QConnmanEnginePlugin" +# _LOADED = "qt_plugin" -- cgit v1.2.3 From dba2cc84aec0460ae163022b24dcd7f18b92335f Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 29 Mar 2019 12:26:00 +0100 Subject: CMake: Re-generate plugins/bearer/networkmanager Change-Id: I70ef85e4c758d76c23012da981c6f583c179dd02 Reviewed-by: Albert Astals Cid --- src/plugins/bearer/networkmanager/CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt index 44323620d1..62c0b2a98b 100644 --- a/src/plugins/bearer/networkmanager/CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -15,9 +15,11 @@ add_qt_plugin(qnmbearer qnetworkmanagerservice.cpp qnetworkmanagerservice.h LIBRARIES Qt::Core - Qt::NetworkPrivate Qt::DBus - # OTHER_FILES = "networkmanager.json" - # PLUGIN_CLASS_NAME = "QNetworkManagerEnginePlugin" - # _LOADED = "qt_plugin" + Qt::NetworkPrivate ) + +#### Keys ignored in scope 1:.:networkmanager.pro:: +# OTHER_FILES = "networkmanager.json" +# PLUGIN_CLASS_NAME = "QNetworkManagerEnginePlugin" +# _LOADED = "qt_plugin" -- cgit v1.2.3 From 0434b7fb38c33b26700daabe31a29ab0cd4294d7 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 6 May 2019 15:02:40 +0200 Subject: CMake: Regenerate src/plugins/bearer Change-Id: I6c900247eb03b8afc3f299b5dbca5bac64527a52 Reviewed-by: Alexandru Croitor --- src/plugins/bearer/CMakeLists.txt | 10 ++++++---- src/plugins/bearer/connman/CMakeLists.txt | 6 ++++-- src/plugins/bearer/generic/CMakeLists.txt | 7 +++++-- src/plugins/bearer/networkmanager/CMakeLists.txt | 6 ++++-- 4 files changed, 19 insertions(+), 10 deletions(-) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/CMakeLists.txt b/src/plugins/bearer/CMakeLists.txt index ec860de2cb..88e4f4206e 100644 --- a/src/plugins/bearer/CMakeLists.txt +++ b/src/plugins/bearer/CMakeLists.txt @@ -1,9 +1,11 @@ -if (NOT ANDROID AND LINUX AND QT_FEATURE_dbus) +# Generated from bearer.pro. + +if(NOT ANDROID AND LINUX AND TARGET Qt::DBus) # special case add_subdirectory(generic) add_subdirectory(connman) add_subdirectory(networkmanager) -elseif(ANDROID AND NOT ANDROID_EMBEDDED) -# TODO add_subdirectory(android) -else() +else if(ANDROID AND NOT ANDROID_EMBEDDED) # special case + add_subdirectory(android) +else() # special case add_subdirectory(generic) endif() diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt index 08f286aee1..c7cfa6efda 100644 --- a/src/plugins/bearer/connman/CMakeLists.txt +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -14,12 +14,14 @@ add_qt_plugin(qconnmanbearer qconnmanengine.cpp qconnmanengine.h qconnmanservice_linux.cpp qconnmanservice_linux_p.h LIBRARIES + Qt::NetworkPrivate + PUBLIC_LIBRARIES Qt::Core Qt::DBus - Qt::NetworkPrivate + Qt::Network ) -#### Keys ignored in scope 1:.:connman.pro:: +#### Keys ignored in scope 1:.:.:connman.pro:: # OTHER_FILES = "connman.json" # PLUGIN_CLASS_NAME = "QConnmanEnginePlugin" # _LOADED = "qt_plugin" diff --git a/src/plugins/bearer/generic/CMakeLists.txt b/src/plugins/bearer/generic/CMakeLists.txt index 822cd12b19..f68b34a99b 100644 --- a/src/plugins/bearer/generic/CMakeLists.txt +++ b/src/plugins/bearer/generic/CMakeLists.txt @@ -15,9 +15,12 @@ add_qt_plugin(qgenericbearer LIBRARIES Qt::CorePrivate Qt::NetworkPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::Network ) -#### Keys ignored in scope 1:.:generic.pro:: +#### Keys ignored in scope 1:.:.:generic.pro:: # OTHER_FILES = "generic.json" # PLUGIN_CLASS_NAME = "QGenericEnginePlugin" # _LOADED = "qt_plugin" @@ -26,6 +29,6 @@ add_qt_plugin(qgenericbearer ##################################################################### extend_target(qgenericbearer CONDITION WIN32 AND NOT WINRT - LIBRARIES + PUBLIC_LIBRARIES iphlpapi ) diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt index 62c0b2a98b..998f06e47a 100644 --- a/src/plugins/bearer/networkmanager/CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -14,12 +14,14 @@ add_qt_plugin(qnmbearer qnetworkmanagerengine.cpp qnetworkmanagerengine.h qnetworkmanagerservice.cpp qnetworkmanagerservice.h LIBRARIES + Qt::NetworkPrivate + PUBLIC_LIBRARIES Qt::Core Qt::DBus - Qt::NetworkPrivate + Qt::Network ) -#### Keys ignored in scope 1:.:networkmanager.pro:: +#### Keys ignored in scope 1:.:.:networkmanager.pro:: # OTHER_FILES = "networkmanager.json" # PLUGIN_CLASS_NAME = "QNetworkManagerEnginePlugin" # _LOADED = "qt_plugin" -- cgit v1.2.3 From bbe5c58079b642908168ed8a32b14a539380dd4e Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 7 May 2019 13:39:46 +0200 Subject: CMake: Fix src/plugins/bearer Sorry, last-minute-typo hit again:-/ Change-Id: I7130ba3306a96584e2bc33bc1aa27990a3508035 Reviewed-by: Albert Astals Cid --- src/plugins/bearer/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/CMakeLists.txt b/src/plugins/bearer/CMakeLists.txt index 88e4f4206e..c5218959d6 100644 --- a/src/plugins/bearer/CMakeLists.txt +++ b/src/plugins/bearer/CMakeLists.txt @@ -4,7 +4,7 @@ if(NOT ANDROID AND LINUX AND TARGET Qt::DBus) # special case add_subdirectory(generic) add_subdirectory(connman) add_subdirectory(networkmanager) -else if(ANDROID AND NOT ANDROID_EMBEDDED) # special case +elseif(ANDROID AND NOT ANDROID_EMBEDDED) # special case add_subdirectory(android) else() # special case add_subdirectory(generic) -- cgit v1.2.3 From c9b7cc349a13b722ecd636ec4eb8e21f9f712add Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 23 May 2019 13:51:05 +0200 Subject: Remove usages of Q_OS_WINCE This platform is history. Change-Id: Iddfab008a509f4828c321730414c8204055cf7af Reviewed-by: Maurice Kalinowski --- src/plugins/bearer/nla/qnlaengine.cpp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/nla/qnlaengine.cpp b/src/plugins/bearer/nla/qnlaengine.cpp index bf10e0cc1f..e1e60389f1 100644 --- a/src/plugins/bearer/nla/qnlaengine.cpp +++ b/src/plugins/bearer/nla/qnlaengine.cpp @@ -119,9 +119,6 @@ static void printBlob(NLA_BLOB *blob) static QNetworkConfiguration::BearerType qGetInterfaceType(const QString &interface) { -#ifdef Q_OS_WINCE - Q_UNUSED(interface) -#else unsigned long oid; DWORD bytesWritten; @@ -175,8 +172,6 @@ static QNetworkConfiguration::BearerType qGetInterfaceType(const QString &interf #ifdef BEARER_MANAGEMENT_DEBUG qDebug() << medium << physicalMedium; -#endif - #endif return QNetworkConfiguration::BearerUnknown; @@ -307,16 +302,12 @@ void QNlaThread::run() break; } -#ifndef Q_OS_WINCE // Not interested in unrelated IO completion events // although we also don't want to block them while (WaitForSingleObjectEx(changeEvent, WSA_INFINITE, true) != WAIT_IO_COMPLETION && handle) { } -#else - WaitForSingleObject(changeEvent, WSA_INFINITE); -#endif mutex.lock(); if (handle) { -- cgit v1.2.3 From f32a6cfb6b6236533508901f114ab57396da8ff3 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 3 Jun 2019 13:47:23 +0200 Subject: Fix cmake configure step on Android Now that ANDROID_EMBEDDED is not set by default anymore, we start descending into Android specific sub-directories. This patch generates a stub file but the Java bits still need to be ported. Change-Id: Icbfc3ad2c1ef266980161bca081c7c4275873efd Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor --- src/plugins/bearer/android/CMakeLists.txt | 5 +++++ src/plugins/bearer/android/src/CMakeLists.txt | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 src/plugins/bearer/android/CMakeLists.txt create mode 100644 src/plugins/bearer/android/src/CMakeLists.txt (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/android/CMakeLists.txt b/src/plugins/bearer/android/CMakeLists.txt new file mode 100644 index 0000000000..a5f5393378 --- /dev/null +++ b/src/plugins/bearer/android/CMakeLists.txt @@ -0,0 +1,5 @@ +# Generated from android.pro. + +add_subdirectory(src) +# TODO: +# add_subdirectory(jar) diff --git a/src/plugins/bearer/android/src/CMakeLists.txt b/src/plugins/bearer/android/src/CMakeLists.txt new file mode 100644 index 0000000000..260e908170 --- /dev/null +++ b/src/plugins/bearer/android/src/CMakeLists.txt @@ -0,0 +1,27 @@ +# Generated from src.pro. + +##################################################################### +## qandroidbearer Plugin: +##################################################################### + +add_qt_plugin(qandroidbearer + TYPE bearer + SOURCES + ../../qbearerengine_impl.h + ../../qnetworksession_impl.cpp ../../qnetworksession_impl.h + main.cpp + qandroidbearerengine.cpp qandroidbearerengine.h + wrappers/androidconnectivitymanager.cpp wrappers/androidconnectivitymanager.h + INCLUDE_DIRECTORIES + wrappers + LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::Network +) + +#### Keys ignored in scope 1:.:.:src.pro:: +# PLUGIN_CLASS_NAME = "QAndroidBearerEnginePlugin" +# _LOADED = "qt_plugin" -- cgit v1.2.3 From cd408af9bc11881f351b359ebf81f02f0f69ef86 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 22 Jul 2019 19:32:23 +0200 Subject: Add some missing CLASS_NAME values to plugins This substantially decreases the number of warnings when doing a Qt static build with examples. This is a quickfix modifying the relevant files directly. A proper fix will follow that regenerates the whole files. Change-Id: I2a3cc2c4ea02b3412beb96f7b4be9d43365a460d Reviewed-by: Simon Hausmann Reviewed-by: Qt CMake Build Bot --- src/plugins/bearer/generic/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/generic/CMakeLists.txt b/src/plugins/bearer/generic/CMakeLists.txt index f68b34a99b..54e9ca62f3 100644 --- a/src/plugins/bearer/generic/CMakeLists.txt +++ b/src/plugins/bearer/generic/CMakeLists.txt @@ -6,6 +6,7 @@ add_qt_plugin(qgenericbearer TYPE bearer + CLASS_NAME QGenericEnginePlugin SOURCES ../platformdefs_win.h ../qbearerengine_impl.h -- cgit v1.2.3 From ff7101d6c8654f6fb2c78cd4b7d659d1c188c3cb Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Mon, 26 Aug 2019 15:01:37 +0200 Subject: Add Support for Android Bearer Jar This is required to package an apk which depends on QtDelcarative. Change-Id: I1f6bdeb984f08d73f010fb4210242e5c99f1969f Reviewed-by: Alexandru Croitor --- src/plugins/bearer/android/CMakeLists.txt | 3 +-- src/plugins/bearer/android/jar/CMakeLists.txt | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 src/plugins/bearer/android/jar/CMakeLists.txt (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/android/CMakeLists.txt b/src/plugins/bearer/android/CMakeLists.txt index a5f5393378..193cbf1fe3 100644 --- a/src/plugins/bearer/android/CMakeLists.txt +++ b/src/plugins/bearer/android/CMakeLists.txt @@ -1,5 +1,4 @@ # Generated from android.pro. add_subdirectory(src) -# TODO: -# add_subdirectory(jar) +add_subdirectory(jar) diff --git a/src/plugins/bearer/android/jar/CMakeLists.txt b/src/plugins/bearer/android/jar/CMakeLists.txt new file mode 100644 index 0000000000..804e1d0cca --- /dev/null +++ b/src/plugins/bearer/android/jar/CMakeLists.txt @@ -0,0 +1,19 @@ +# special case begin +# This is a manually edited file + +set(path_prefix ${CMAKE_CURRENT_SOURCE_DIR}/src/org/qtproject/qt5/android/bearer) + +set(java_sources + ${path_prefix}/QtNetworkReceiver.java +) + +add_jar(QtAndroidBearer + INCLUDE_JARS ${QT_ANDROID_JAR} + SOURCES ${java_sources} + ) + +install_jar(QtAndroidBearer + DESTINATION jar + COMPONENT Devel) + +# special case end -- cgit v1.2.3 From 5aeb72fb0fd010505128c218b63bdd11b7c0b85d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= Date: Tue, 24 Sep 2019 10:02:02 +0200 Subject: Add CMakeLists.txt for CoreWLAN Change-Id: I28a066b23e89ce2d96fd6cfa935c05b70788ed7a Reviewed-by: Leander Beernaert Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor --- src/plugins/bearer/corewlan/CMakeLists.txt | 36 ++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 src/plugins/bearer/corewlan/CMakeLists.txt (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/corewlan/CMakeLists.txt b/src/plugins/bearer/corewlan/CMakeLists.txt new file mode 100644 index 0000000000..0870e01962 --- /dev/null +++ b/src/plugins/bearer/corewlan/CMakeLists.txt @@ -0,0 +1,36 @@ +# Generated from corewlan.pro. + +##################################################################### +## qcorewlanbearer Plugin: +##################################################################### + +add_qt_plugin(qcorewlanbearer + TYPE bearer + CLASS_NAME QCoreWlanEnginePlugin + SOURCES + ../qbearerengine_impl.h + ../qnetworksession_impl.cpp ../qnetworksession_impl.h + main.cpp + qcorewlanengine.h qcorewlanengine.mm + LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate + PUBLIC_LIBRARIES + ${FWFoundation} + ${FWSystemConfiguration} + Qt::Core + Qt::Network +) + +#### Keys ignored in scope 1:.:.:corewlan.pro:: +# OTHER_FILES = "corewlan.json" +# _LOADED = "qt_plugin" + +## Scopes: +##################################################################### + +extend_target(qcorewlanbearer CONDITION QT_FEATURE_corewlan + PUBLIC_LIBRARIES + ${FWCoreWLAN} + ${FWSecurity} +) -- cgit v1.2.3 From e1beabc3b87ee202fa90af906be0cfeb2ffc2464 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Fri, 27 Sep 2019 15:14:53 +0200 Subject: cmake: Add missing CLASS_NAME MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I5853578f427ae1d1b32ee5405694c216e2dd17cf Reviewed-by: Qt CMake Build Bot Reviewed-by: Mårten Nordheim --- src/plugins/bearer/connman/CMakeLists.txt | 1 + src/plugins/bearer/networkmanager/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt index c7cfa6efda..a449ac8555 100644 --- a/src/plugins/bearer/connman/CMakeLists.txt +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -6,6 +6,7 @@ add_qt_plugin(qconnmanbearer TYPE bearer + CLASS_NAME QConnmanEnginePlugin SOURCES ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h ../qbearerengine_impl.h diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt index 998f06e47a..19ec4767e7 100644 --- a/src/plugins/bearer/networkmanager/CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -6,6 +6,7 @@ add_qt_plugin(qnmbearer TYPE bearer + CLASS_NAME QNetworkManagerEnginePlugin SOURCES ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h ../qbearerengine_impl.h -- cgit v1.2.3 From 115a76297b3c9f94b5258b42270228f06c96a575 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 7 Oct 2019 17:45:35 +0200 Subject: Regenerate plugins bearer and imageformats projects Change-Id: I8858aaf6b96ea030a3af143099aee5dfd15655c8 Reviewed-by: Simon Hausmann Reviewed-by: Qt CMake Build Bot --- src/plugins/bearer/.prev_CMakeLists.txt | 12 ++++++++++++ src/plugins/bearer/CMakeLists.txt | 9 ++++++--- src/plugins/bearer/android/jar/.prev_CMakeLists.txt | 18 ++++++++++++++++++ src/plugins/bearer/android/src/CMakeLists.txt | 2 +- src/plugins/bearer/connman/CMakeLists.txt | 1 - src/plugins/bearer/generic/CMakeLists.txt | 1 - src/plugins/bearer/networkmanager/CMakeLists.txt | 1 - 7 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 src/plugins/bearer/.prev_CMakeLists.txt create mode 100644 src/plugins/bearer/android/jar/.prev_CMakeLists.txt (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/.prev_CMakeLists.txt b/src/plugins/bearer/.prev_CMakeLists.txt new file mode 100644 index 0000000000..a7a36f60c6 --- /dev/null +++ b/src/plugins/bearer/.prev_CMakeLists.txt @@ -0,0 +1,12 @@ +# Generated from bearer.pro. + +if(SUBDIRS_ISEMPTY OR (TARGET Qt::DBus AND linux_x_ AND NOT ANDROID)) + add_subdirectory(generic) +endif() +if(TARGET Qt::DBus AND linux_x_ AND NOT ANDROID) + add_subdirectory(connman) + add_subdirectory(networkmanager) +endif() +if(ANDROID AND NOT ANDROID_EMBEDDED) + add_subdirectory(android) +endif() diff --git a/src/plugins/bearer/CMakeLists.txt b/src/plugins/bearer/CMakeLists.txt index c5218959d6..528061d264 100644 --- a/src/plugins/bearer/CMakeLists.txt +++ b/src/plugins/bearer/CMakeLists.txt @@ -1,11 +1,14 @@ # Generated from bearer.pro. -if(NOT ANDROID AND LINUX AND TARGET Qt::DBus) # special case +# special case begin +# The whole block is manual. +if(NOT ANDROID AND LINUX AND TARGET Qt::DBus) add_subdirectory(generic) add_subdirectory(connman) add_subdirectory(networkmanager) -elseif(ANDROID AND NOT ANDROID_EMBEDDED) # special case +elseif(ANDROID AND NOT ANDROID_EMBEDDED) add_subdirectory(android) -else() # special case +else() add_subdirectory(generic) endif() +# special case end diff --git a/src/plugins/bearer/android/jar/.prev_CMakeLists.txt b/src/plugins/bearer/android/jar/.prev_CMakeLists.txt new file mode 100644 index 0000000000..d7f5c86488 --- /dev/null +++ b/src/plugins/bearer/android/jar/.prev_CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from jar.pro. + +##################################################################### +## QtAndroidBearer Binary: +##################################################################### + +add_qt_executable(QtAndroidBearer + GUI + INSTALL_DIRECTORY "${INSTALL_DIRECTORY}/jar" + OUTPUT_DIRECTORY "$$MODULE_BASE_OUTDIR/jar" + PUBLIC_LIBRARIES + Qt::Gui +) + +#### Keys ignored in scope 1:.:.:jar.pro:: +# JAVACLASSPATH = "$$PWD/src" +# JAVASOURCES = "$$PWD/src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java" +# _LOADED = "qt_build_paths" diff --git a/src/plugins/bearer/android/src/CMakeLists.txt b/src/plugins/bearer/android/src/CMakeLists.txt index 260e908170..f887f92685 100644 --- a/src/plugins/bearer/android/src/CMakeLists.txt +++ b/src/plugins/bearer/android/src/CMakeLists.txt @@ -6,6 +6,7 @@ add_qt_plugin(qandroidbearer TYPE bearer + CLASS_NAME QAndroidBearerEnginePlugin SOURCES ../../qbearerengine_impl.h ../../qnetworksession_impl.cpp ../../qnetworksession_impl.h @@ -23,5 +24,4 @@ add_qt_plugin(qandroidbearer ) #### Keys ignored in scope 1:.:.:src.pro:: -# PLUGIN_CLASS_NAME = "QAndroidBearerEnginePlugin" # _LOADED = "qt_plugin" diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt index a449ac8555..00f0c7dccb 100644 --- a/src/plugins/bearer/connman/CMakeLists.txt +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -24,5 +24,4 @@ add_qt_plugin(qconnmanbearer #### Keys ignored in scope 1:.:.:connman.pro:: # OTHER_FILES = "connman.json" -# PLUGIN_CLASS_NAME = "QConnmanEnginePlugin" # _LOADED = "qt_plugin" diff --git a/src/plugins/bearer/generic/CMakeLists.txt b/src/plugins/bearer/generic/CMakeLists.txt index 54e9ca62f3..e793284d9e 100644 --- a/src/plugins/bearer/generic/CMakeLists.txt +++ b/src/plugins/bearer/generic/CMakeLists.txt @@ -23,7 +23,6 @@ add_qt_plugin(qgenericbearer #### Keys ignored in scope 1:.:.:generic.pro:: # OTHER_FILES = "generic.json" -# PLUGIN_CLASS_NAME = "QGenericEnginePlugin" # _LOADED = "qt_plugin" ## Scopes: diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt index 19ec4767e7..c615aec243 100644 --- a/src/plugins/bearer/networkmanager/CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -24,5 +24,4 @@ add_qt_plugin(qnmbearer #### Keys ignored in scope 1:.:.:networkmanager.pro:: # OTHER_FILES = "networkmanager.json" -# PLUGIN_CLASS_NAME = "QNetworkManagerEnginePlugin" # _LOADED = "qt_plugin" -- cgit v1.2.3 From b2662b05dd078c46b82f5f041f51b0b83554113d Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 14 Oct 2019 15:53:00 +0200 Subject: Temporarily disable automatic static linking of bearer plugins The bearer plugins cause duplicate symbol errors when linking executables in a static build. Task-number: QTBUG-79211 Change-Id: I9f6399bd803c154c07b096b0df1be864816f863e Reviewed-by: Simon Hausmann --- src/plugins/bearer/connman/CMakeLists.txt | 1 + src/plugins/bearer/networkmanager/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt index 00f0c7dccb..cadd67bbce 100644 --- a/src/plugins/bearer/connman/CMakeLists.txt +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -6,6 +6,7 @@ add_qt_plugin(qconnmanbearer TYPE bearer + DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QConnmanEnginePlugin SOURCES ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt index c615aec243..245a18b64d 100644 --- a/src/plugins/bearer/networkmanager/CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -6,6 +6,7 @@ add_qt_plugin(qnmbearer TYPE bearer + DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QNetworkManagerEnginePlugin SOURCES ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h -- cgit v1.2.3 From 4df389eb4f1ae10284c03023e923ce2164d46753 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 17 Oct 2019 10:02:48 +0200 Subject: Re-generate affected cmake files and configure.json after the merge This also removes the workarounds of commit b2662b05dd078c46b82f5f041f51b0b83554113d now that it's fixed "upstream" in the .pro files. Change-Id: Idd5e6273873a700fcda5a6cad2039c4e88b61f6f Reviewed-by: Alexandru Croitor --- src/plugins/bearer/android/src/CMakeLists.txt | 2 -- src/plugins/bearer/connman/.prev_CMakeLists.txt | 25 ++++++++++++++++++++++ src/plugins/bearer/connman/CMakeLists.txt | 3 --- src/plugins/bearer/corewlan/CMakeLists.txt | 2 -- src/plugins/bearer/generic/CMakeLists.txt | 2 -- .../bearer/networkmanager/.prev_CMakeLists.txt | 25 ++++++++++++++++++++++ src/plugins/bearer/networkmanager/CMakeLists.txt | 3 --- 7 files changed, 50 insertions(+), 12 deletions(-) create mode 100644 src/plugins/bearer/connman/.prev_CMakeLists.txt create mode 100644 src/plugins/bearer/networkmanager/.prev_CMakeLists.txt (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/android/src/CMakeLists.txt b/src/plugins/bearer/android/src/CMakeLists.txt index f887f92685..95f8f1fd65 100644 --- a/src/plugins/bearer/android/src/CMakeLists.txt +++ b/src/plugins/bearer/android/src/CMakeLists.txt @@ -8,8 +8,6 @@ add_qt_plugin(qandroidbearer TYPE bearer CLASS_NAME QAndroidBearerEnginePlugin SOURCES - ../../qbearerengine_impl.h - ../../qnetworksession_impl.cpp ../../qnetworksession_impl.h main.cpp qandroidbearerengine.cpp qandroidbearerengine.h wrappers/androidconnectivitymanager.cpp wrappers/androidconnectivitymanager.h diff --git a/src/plugins/bearer/connman/.prev_CMakeLists.txt b/src/plugins/bearer/connman/.prev_CMakeLists.txt new file mode 100644 index 0000000000..ff368dd693 --- /dev/null +++ b/src/plugins/bearer/connman/.prev_CMakeLists.txt @@ -0,0 +1,25 @@ +# Generated from connman.pro. + +##################################################################### +## qconnmanbearer Plugin: +##################################################################### + +add_qt_plugin(qconnmanbearer + TYPE bearer + CLASS_NAME QConnmanEnginePlugin + SOURCES + ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h + main.cpp + qconnmanengine.cpp qconnmanengine.h + qconnmanservice_linux.cpp qconnmanservice_linux_p.h + LIBRARIES + Qt::NetworkPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::DBus + Qt::Network +) + +#### Keys ignored in scope 1:.:.:connman.pro:: +# OTHER_FILES = "connman.json" +# _LOADED = "qt_plugin" diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt index cadd67bbce..ff368dd693 100644 --- a/src/plugins/bearer/connman/CMakeLists.txt +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -6,12 +6,9 @@ add_qt_plugin(qconnmanbearer TYPE bearer - DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QConnmanEnginePlugin SOURCES ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h - ../qbearerengine_impl.h - ../qnetworksession_impl.cpp ../qnetworksession_impl.h main.cpp qconnmanengine.cpp qconnmanengine.h qconnmanservice_linux.cpp qconnmanservice_linux_p.h diff --git a/src/plugins/bearer/corewlan/CMakeLists.txt b/src/plugins/bearer/corewlan/CMakeLists.txt index 0870e01962..8323d9885a 100644 --- a/src/plugins/bearer/corewlan/CMakeLists.txt +++ b/src/plugins/bearer/corewlan/CMakeLists.txt @@ -8,8 +8,6 @@ add_qt_plugin(qcorewlanbearer TYPE bearer CLASS_NAME QCoreWlanEnginePlugin SOURCES - ../qbearerengine_impl.h - ../qnetworksession_impl.cpp ../qnetworksession_impl.h main.cpp qcorewlanengine.h qcorewlanengine.mm LIBRARIES diff --git a/src/plugins/bearer/generic/CMakeLists.txt b/src/plugins/bearer/generic/CMakeLists.txt index e793284d9e..990a6f6743 100644 --- a/src/plugins/bearer/generic/CMakeLists.txt +++ b/src/plugins/bearer/generic/CMakeLists.txt @@ -9,8 +9,6 @@ add_qt_plugin(qgenericbearer CLASS_NAME QGenericEnginePlugin SOURCES ../platformdefs_win.h - ../qbearerengine_impl.h - ../qnetworksession_impl.cpp ../qnetworksession_impl.h main.cpp qgenericengine.cpp qgenericengine.h LIBRARIES diff --git a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt new file mode 100644 index 0000000000..171250233e --- /dev/null +++ b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt @@ -0,0 +1,25 @@ +# Generated from networkmanager.pro. + +##################################################################### +## qnmbearer Plugin: +##################################################################### + +add_qt_plugin(qnmbearer + TYPE bearer + CLASS_NAME QNetworkManagerEnginePlugin + SOURCES + ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h + main.cpp + qnetworkmanagerengine.cpp qnetworkmanagerengine.h + qnetworkmanagerservice.cpp qnetworkmanagerservice.h + LIBRARIES + Qt::NetworkPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::DBus + Qt::Network +) + +#### Keys ignored in scope 1:.:.:networkmanager.pro:: +# OTHER_FILES = "networkmanager.json" +# _LOADED = "qt_plugin" diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt index 245a18b64d..171250233e 100644 --- a/src/plugins/bearer/networkmanager/CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -6,12 +6,9 @@ add_qt_plugin(qnmbearer TYPE bearer - DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QNetworkManagerEnginePlugin SOURCES ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h - ../qbearerengine_impl.h - ../qnetworksession_impl.cpp ../qnetworksession_impl.h main.cpp qnetworkmanagerengine.cpp qnetworkmanagerengine.h qnetworkmanagerservice.cpp qnetworkmanagerservice.h -- cgit v1.2.3 From 373be4200b162ae9b2244d7019770911bc73317a Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Fri, 18 Oct 2019 14:28:08 +0200 Subject: Add conversion code for Java code Add support to pro2cmake to convert java code for android. Add support to override API_LEVEL for the Android sdk jar file. If the sdk is not found, we'll default to the one located by QT_ANDROID_JAR. Change-Id: If0b746dc7f9148ac43e6592a4a4dd23d46bbd4cd Reviewed-by: Simon Hausmann --- .../bearer/android/jar/.prev_CMakeLists.txt | 24 ++++++++++------------ src/plugins/bearer/android/jar/CMakeLists.txt | 15 ++++++++------ 2 files changed, 20 insertions(+), 19 deletions(-) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/android/jar/.prev_CMakeLists.txt b/src/plugins/bearer/android/jar/.prev_CMakeLists.txt index d7f5c86488..f5f25c4f8b 100644 --- a/src/plugins/bearer/android/jar/.prev_CMakeLists.txt +++ b/src/plugins/bearer/android/jar/.prev_CMakeLists.txt @@ -1,18 +1,16 @@ # Generated from jar.pro. -##################################################################### -## QtAndroidBearer Binary: -##################################################################### +set(java_sources + src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java +) + +add_jar(QtAndroidBearer + INCLUDE_JARS ${QT_ANDROID_JAR} + SOURCES ${java_sources} +) -add_qt_executable(QtAndroidBearer - GUI - INSTALL_DIRECTORY "${INSTALL_DIRECTORY}/jar" - OUTPUT_DIRECTORY "$$MODULE_BASE_OUTDIR/jar" - PUBLIC_LIBRARIES - Qt::Gui +install_jar(QtAndroidBearer + DESTINATION jar + COMPONENT Devel ) -#### Keys ignored in scope 1:.:.:jar.pro:: -# JAVACLASSPATH = "$$PWD/src" -# JAVASOURCES = "$$PWD/src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java" -# _LOADED = "qt_build_paths" diff --git a/src/plugins/bearer/android/jar/CMakeLists.txt b/src/plugins/bearer/android/jar/CMakeLists.txt index 804e1d0cca..16641d42b7 100644 --- a/src/plugins/bearer/android/jar/CMakeLists.txt +++ b/src/plugins/bearer/android/jar/CMakeLists.txt @@ -1,10 +1,9 @@ -# special case begin -# This is a manually edited file - -set(path_prefix ${CMAKE_CURRENT_SOURCE_DIR}/src/org/qtproject/qt5/android/bearer) +##################################################################### +## QtAndroidBearer Binary: +##################################################################### set(java_sources - ${path_prefix}/QtNetworkReceiver.java + src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java ) add_jar(QtAndroidBearer @@ -16,4 +15,8 @@ install_jar(QtAndroidBearer DESTINATION jar COMPONENT Devel) -# special case end +#### Keys ignored in scope 1:.:.:jar.pro:: +# JAVACLASSPATH = "$$PWD/src" +# JAVASOURCES = "$$PWD/src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java" +# _LOADED = "qt_build_paths" + -- cgit v1.2.3 From 78b89547ad00153a8e02553a2e87d45415bd2314 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 14 Oct 2019 15:53:00 +0200 Subject: Temporarily disable automatic static linking of bearer plugins The bearer plugins cause duplicate symbol errors when linking executables in a static build. Re-apply commit b2662b05dd078c46b82f5f041f51b0b83554113d Task-number: QTBUG-79211 Change-Id: Ie4c1359f1f4d649a22570a31634c94fd22102730 Reviewed-by: Simon Hausmann --- src/plugins/bearer/connman/CMakeLists.txt | 1 + src/plugins/bearer/networkmanager/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt index ff368dd693..9e8bab82ae 100644 --- a/src/plugins/bearer/connman/CMakeLists.txt +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -6,6 +6,7 @@ add_qt_plugin(qconnmanbearer TYPE bearer + DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QConnmanEnginePlugin SOURCES ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt index 171250233e..efecd3c1f5 100644 --- a/src/plugins/bearer/networkmanager/CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -6,6 +6,7 @@ add_qt_plugin(qnmbearer TYPE bearer + DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QNetworkManagerEnginePlugin SOURCES ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h -- cgit v1.2.3 From 307cd64c5726f93dbc91cafbce986875a6cce3e1 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 7 Nov 2019 16:00:11 +0100 Subject: Fix static linking when using bearer plugins Now that 5f160a3699d80d1736f691ad9ef774eb6aa28079 is merged to wip/cmake, we should be able to remove the previous workaround of not linking in the bearer plugins. Reverts 78b89547ad00153a8e02553a2e87d45415bd2314. Fixes: QTBUG-79211 Change-Id: Iaa6633bd74d51ceeed9fa1ffb536445ef817764b Reviewed-by: Leander Beernaert Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- src/plugins/bearer/connman/CMakeLists.txt | 1 - src/plugins/bearer/networkmanager/CMakeLists.txt | 1 - 2 files changed, 2 deletions(-) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt index 9e8bab82ae..ff368dd693 100644 --- a/src/plugins/bearer/connman/CMakeLists.txt +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -6,7 +6,6 @@ add_qt_plugin(qconnmanbearer TYPE bearer - DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QConnmanEnginePlugin SOURCES ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt index efecd3c1f5..171250233e 100644 --- a/src/plugins/bearer/networkmanager/CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -6,7 +6,6 @@ add_qt_plugin(qnmbearer TYPE bearer - DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QNetworkManagerEnginePlugin SOURCES ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h -- cgit v1.2.3 From cb6f92c481a451bb8a7a26c8d933761896cf3884 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 12 Nov 2019 14:26:58 +0100 Subject: Regenerate everything under ./src Change-Id: Ibdbdc17f8c2ee41356f490dd839a47e1bcf4c586 Reviewed-by: Leander Beernaert Reviewed-by: Simon Hausmann Reviewed-by: Qt CMake Build Bot --- src/plugins/bearer/android/src/CMakeLists.txt | 3 --- src/plugins/bearer/connman/CMakeLists.txt | 1 - src/plugins/bearer/corewlan/CMakeLists.txt | 1 - src/plugins/bearer/generic/CMakeLists.txt | 1 - src/plugins/bearer/networkmanager/CMakeLists.txt | 1 - 5 files changed, 7 deletions(-) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/android/src/CMakeLists.txt b/src/plugins/bearer/android/src/CMakeLists.txt index 95f8f1fd65..28beab0bbd 100644 --- a/src/plugins/bearer/android/src/CMakeLists.txt +++ b/src/plugins/bearer/android/src/CMakeLists.txt @@ -20,6 +20,3 @@ add_qt_plugin(qandroidbearer Qt::Core Qt::Network ) - -#### Keys ignored in scope 1:.:.:src.pro:: -# _LOADED = "qt_plugin" diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt index ff368dd693..c1940a1e16 100644 --- a/src/plugins/bearer/connman/CMakeLists.txt +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -22,4 +22,3 @@ add_qt_plugin(qconnmanbearer #### Keys ignored in scope 1:.:.:connman.pro:: # OTHER_FILES = "connman.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/bearer/corewlan/CMakeLists.txt b/src/plugins/bearer/corewlan/CMakeLists.txt index 8323d9885a..f42f9cfb52 100644 --- a/src/plugins/bearer/corewlan/CMakeLists.txt +++ b/src/plugins/bearer/corewlan/CMakeLists.txt @@ -22,7 +22,6 @@ add_qt_plugin(qcorewlanbearer #### Keys ignored in scope 1:.:.:corewlan.pro:: # OTHER_FILES = "corewlan.json" -# _LOADED = "qt_plugin" ## Scopes: ##################################################################### diff --git a/src/plugins/bearer/generic/CMakeLists.txt b/src/plugins/bearer/generic/CMakeLists.txt index 990a6f6743..9f02d5cd7f 100644 --- a/src/plugins/bearer/generic/CMakeLists.txt +++ b/src/plugins/bearer/generic/CMakeLists.txt @@ -21,7 +21,6 @@ add_qt_plugin(qgenericbearer #### Keys ignored in scope 1:.:.:generic.pro:: # OTHER_FILES = "generic.json" -# _LOADED = "qt_plugin" ## Scopes: ##################################################################### diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt index 171250233e..f0748bebde 100644 --- a/src/plugins/bearer/networkmanager/CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -22,4 +22,3 @@ add_qt_plugin(qnmbearer #### Keys ignored in scope 1:.:.:networkmanager.pro:: # OTHER_FILES = "networkmanager.json" -# _LOADED = "qt_plugin" -- cgit v1.2.3 From f2c57e83ab21f5f5ad01f309643821a8851493b5 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 12 Nov 2019 15:33:54 +0100 Subject: Revert "Fix static linking when using bearer plugins" While the first patch that was required to fix duplicate symbols errors was merged from dev to wip/cmake, the second one 7a605edc226d4051602e157fe575f17dfaac0964 is not yet merged. So revert the revert to temporarily fix static builds until we do another merge from dev to wip/cmake. This reverts commit 307cd64c5726f93dbc91cafbce986875a6cce3e1 Task-number: Fixes: QTBUG-79211 Change-Id: I72052513fc0e0183b3ce8270b4ce3f2ff44b664d Reviewed-by: Leander Beernaert Reviewed-by: Simon Hausmann --- src/plugins/bearer/connman/CMakeLists.txt | 1 + src/plugins/bearer/networkmanager/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt index c1940a1e16..af2a599cb0 100644 --- a/src/plugins/bearer/connman/CMakeLists.txt +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -6,6 +6,7 @@ add_qt_plugin(qconnmanbearer TYPE bearer + DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QConnmanEnginePlugin SOURCES ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt index f0748bebde..bbb1650140 100644 --- a/src/plugins/bearer/networkmanager/CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -6,6 +6,7 @@ add_qt_plugin(qnmbearer TYPE bearer + DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QNetworkManagerEnginePlugin SOURCES ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h -- cgit v1.2.3 From 5c28fce38ecd9dc056e18ad124aba670f792c97e Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 13 Nov 2019 13:37:20 +0100 Subject: Regenerate qtbase tests and src/* for some small fixes Change-Id: I049829492971875a5c5ff159104707d9e2ad1e46 Reviewed-by: Leander Beernaert Reviewed-by: Simon Hausmann --- src/plugins/bearer/connman/.prev_CMakeLists.txt | 1 - src/plugins/bearer/networkmanager/.prev_CMakeLists.txt | 1 - 2 files changed, 2 deletions(-) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/connman/.prev_CMakeLists.txt b/src/plugins/bearer/connman/.prev_CMakeLists.txt index ff368dd693..c1940a1e16 100644 --- a/src/plugins/bearer/connman/.prev_CMakeLists.txt +++ b/src/plugins/bearer/connman/.prev_CMakeLists.txt @@ -22,4 +22,3 @@ add_qt_plugin(qconnmanbearer #### Keys ignored in scope 1:.:.:connman.pro:: # OTHER_FILES = "connman.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt index 171250233e..f0748bebde 100644 --- a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt @@ -22,4 +22,3 @@ add_qt_plugin(qnmbearer #### Keys ignored in scope 1:.:.:networkmanager.pro:: # OTHER_FILES = "networkmanager.json" -# _LOADED = "qt_plugin" -- cgit v1.2.3 From e9a58ba9e55467f8c69e19dd52c2afa7cbb39529 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 13 Nov 2019 15:00:38 +0100 Subject: Regenerate src/* Change-Id: I0314b4faa1e4860e86198eea4189987e527dfec2 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- src/plugins/bearer/android/src/CMakeLists.txt | 2 +- src/plugins/bearer/connman/.prev_CMakeLists.txt | 2 +- src/plugins/bearer/connman/CMakeLists.txt | 2 +- src/plugins/bearer/corewlan/CMakeLists.txt | 4 ++-- src/plugins/bearer/generic/CMakeLists.txt | 4 ++-- src/plugins/bearer/networkmanager/.prev_CMakeLists.txt | 2 +- src/plugins/bearer/networkmanager/CMakeLists.txt | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/android/src/CMakeLists.txt b/src/plugins/bearer/android/src/CMakeLists.txt index 28beab0bbd..8aee553d86 100644 --- a/src/plugins/bearer/android/src/CMakeLists.txt +++ b/src/plugins/bearer/android/src/CMakeLists.txt @@ -4,7 +4,7 @@ ## qandroidbearer Plugin: ##################################################################### -add_qt_plugin(qandroidbearer +qt_add_plugin(qandroidbearer TYPE bearer CLASS_NAME QAndroidBearerEnginePlugin SOURCES diff --git a/src/plugins/bearer/connman/.prev_CMakeLists.txt b/src/plugins/bearer/connman/.prev_CMakeLists.txt index c1940a1e16..d753919a2b 100644 --- a/src/plugins/bearer/connman/.prev_CMakeLists.txt +++ b/src/plugins/bearer/connman/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qconnmanbearer Plugin: ##################################################################### -add_qt_plugin(qconnmanbearer +qt_add_plugin(qconnmanbearer TYPE bearer CLASS_NAME QConnmanEnginePlugin SOURCES diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt index af2a599cb0..1ad024806b 100644 --- a/src/plugins/bearer/connman/CMakeLists.txt +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -4,7 +4,7 @@ ## qconnmanbearer Plugin: ##################################################################### -add_qt_plugin(qconnmanbearer +qt_add_plugin(qconnmanbearer TYPE bearer DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QConnmanEnginePlugin diff --git a/src/plugins/bearer/corewlan/CMakeLists.txt b/src/plugins/bearer/corewlan/CMakeLists.txt index f42f9cfb52..914f5ceae1 100644 --- a/src/plugins/bearer/corewlan/CMakeLists.txt +++ b/src/plugins/bearer/corewlan/CMakeLists.txt @@ -4,7 +4,7 @@ ## qcorewlanbearer Plugin: ##################################################################### -add_qt_plugin(qcorewlanbearer +qt_add_plugin(qcorewlanbearer TYPE bearer CLASS_NAME QCoreWlanEnginePlugin SOURCES @@ -26,7 +26,7 @@ add_qt_plugin(qcorewlanbearer ## Scopes: ##################################################################### -extend_target(qcorewlanbearer CONDITION QT_FEATURE_corewlan +qt_extend_target(qcorewlanbearer CONDITION QT_FEATURE_corewlan PUBLIC_LIBRARIES ${FWCoreWLAN} ${FWSecurity} diff --git a/src/plugins/bearer/generic/CMakeLists.txt b/src/plugins/bearer/generic/CMakeLists.txt index 9f02d5cd7f..c41688e82a 100644 --- a/src/plugins/bearer/generic/CMakeLists.txt +++ b/src/plugins/bearer/generic/CMakeLists.txt @@ -4,7 +4,7 @@ ## qgenericbearer Plugin: ##################################################################### -add_qt_plugin(qgenericbearer +qt_add_plugin(qgenericbearer TYPE bearer CLASS_NAME QGenericEnginePlugin SOURCES @@ -25,7 +25,7 @@ add_qt_plugin(qgenericbearer ## Scopes: ##################################################################### -extend_target(qgenericbearer CONDITION WIN32 AND NOT WINRT +qt_extend_target(qgenericbearer CONDITION WIN32 AND NOT WINRT PUBLIC_LIBRARIES iphlpapi ) diff --git a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt index f0748bebde..993e4d7900 100644 --- a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qnmbearer Plugin: ##################################################################### -add_qt_plugin(qnmbearer +qt_add_plugin(qnmbearer TYPE bearer CLASS_NAME QNetworkManagerEnginePlugin SOURCES diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt index bbb1650140..a6fb609e9d 100644 --- a/src/plugins/bearer/networkmanager/CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -4,7 +4,7 @@ ## qnmbearer Plugin: ##################################################################### -add_qt_plugin(qnmbearer +qt_add_plugin(qnmbearer TYPE bearer DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QNetworkManagerEnginePlugin -- cgit v1.2.3 From 1c655fb0fc08e89ab5efb23889266b710334f1a5 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Wed, 20 Nov 2019 09:25:19 +0100 Subject: Post merge fixes Change-Id: I78d3c9687f99c0a32da04257e297e88ef0b02581 Reviewed-by: Alexandru Croitor --- src/plugins/bearer/connman/.prev_CMakeLists.txt | 3 ++- src/plugins/bearer/connman/CMakeLists.txt | 3 ++- src/plugins/bearer/networkmanager/.prev_CMakeLists.txt | 3 ++- src/plugins/bearer/networkmanager/CMakeLists.txt | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/connman/.prev_CMakeLists.txt b/src/plugins/bearer/connman/.prev_CMakeLists.txt index d753919a2b..1dc42fcce3 100644 --- a/src/plugins/bearer/connman/.prev_CMakeLists.txt +++ b/src/plugins/bearer/connman/.prev_CMakeLists.txt @@ -8,15 +8,16 @@ qt_add_plugin(qconnmanbearer TYPE bearer CLASS_NAME QConnmanEnginePlugin SOURCES - ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h main.cpp qconnmanengine.cpp qconnmanengine.h qconnmanservice_linux.cpp qconnmanservice_linux_p.h LIBRARIES + Qt::LinuxOfonoSupportPrivate Qt::NetworkPrivate PUBLIC_LIBRARIES Qt::Core Qt::DBus + Qt::LinuxOfonoSupport Qt::Network ) diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt index 1ad024806b..b37ac6ecd7 100644 --- a/src/plugins/bearer/connman/CMakeLists.txt +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -9,15 +9,16 @@ qt_add_plugin(qconnmanbearer DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QConnmanEnginePlugin SOURCES - ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h main.cpp qconnmanengine.cpp qconnmanengine.h qconnmanservice_linux.cpp qconnmanservice_linux_p.h LIBRARIES + Qt::LinuxOfonoSupportPrivate Qt::NetworkPrivate PUBLIC_LIBRARIES Qt::Core Qt::DBus + Qt::LinuxOfonoSupport Qt::Network ) diff --git a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt index 993e4d7900..2d86926aff 100644 --- a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt @@ -8,15 +8,16 @@ qt_add_plugin(qnmbearer TYPE bearer CLASS_NAME QNetworkManagerEnginePlugin SOURCES - ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h main.cpp qnetworkmanagerengine.cpp qnetworkmanagerengine.h qnetworkmanagerservice.cpp qnetworkmanagerservice.h LIBRARIES + Qt::LinuxOfonoSupportPrivate Qt::NetworkPrivate PUBLIC_LIBRARIES Qt::Core Qt::DBus + Qt::LinuxOfonoSupport Qt::Network ) diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt index a6fb609e9d..ed147a8a9f 100644 --- a/src/plugins/bearer/networkmanager/CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -9,15 +9,16 @@ qt_add_plugin(qnmbearer DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QNetworkManagerEnginePlugin SOURCES - ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h main.cpp qnetworkmanagerengine.cpp qnetworkmanagerengine.h qnetworkmanagerservice.cpp qnetworkmanagerservice.h LIBRARIES + Qt::LinuxOfonoSupportPrivate Qt::NetworkPrivate PUBLIC_LIBRARIES Qt::Core Qt::DBus + Qt::LinuxOfonoSupport Qt::Network ) -- cgit v1.2.3 From 704ed86ed338a630970a507a4e7800e78102da06 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 19 Dec 2019 09:37:21 +0100 Subject: Revert "Revert "Fix static linking when using bearer plugins"" The missing commit is in wip/cmake, so it should be safe to reactivate the plugins again. This reverts commit f2c57e83ab21f5f5ad01f309643821a8851493b5. Change-Id: I1a95dac3008674f8baf009cf5556a313cae3d8b3 Reviewed-by: Leander Beernaert Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor --- src/plugins/bearer/connman/CMakeLists.txt | 1 - src/plugins/bearer/networkmanager/CMakeLists.txt | 1 - 2 files changed, 2 deletions(-) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt index b37ac6ecd7..1dc42fcce3 100644 --- a/src/plugins/bearer/connman/CMakeLists.txt +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -6,7 +6,6 @@ qt_add_plugin(qconnmanbearer TYPE bearer - DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QConnmanEnginePlugin SOURCES main.cpp diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt index ed147a8a9f..2d86926aff 100644 --- a/src/plugins/bearer/networkmanager/CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -6,7 +6,6 @@ qt_add_plugin(qnmbearer TYPE bearer - DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QNetworkManagerEnginePlugin SOURCES main.cpp -- cgit v1.2.3 From b10d8eab047c387409716ae87422d2efffee3159 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 22 Jan 2020 14:23:02 +0100 Subject: Regenerate plugin projects to get new target names And also to get the original output names (qmake's "TARGET"), so that the plugin file names are as they were in Qt 5. Change-Id: I96a060d1a81693652847857372bec334728cb549 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- src/plugins/bearer/android/src/CMakeLists.txt | 6 +++--- src/plugins/bearer/connman/.prev_CMakeLists.txt | 7 ++++--- src/plugins/bearer/connman/CMakeLists.txt | 6 +++--- src/plugins/bearer/corewlan/CMakeLists.txt | 8 ++++---- src/plugins/bearer/generic/CMakeLists.txt | 8 ++++---- src/plugins/bearer/networkmanager/.prev_CMakeLists.txt | 7 ++++--- src/plugins/bearer/networkmanager/CMakeLists.txt | 6 +++--- 7 files changed, 25 insertions(+), 23 deletions(-) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/android/src/CMakeLists.txt b/src/plugins/bearer/android/src/CMakeLists.txt index 8aee553d86..d3471f4e63 100644 --- a/src/plugins/bearer/android/src/CMakeLists.txt +++ b/src/plugins/bearer/android/src/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from src.pro. ##################################################################### -## qandroidbearer Plugin: +## QAndroidBearerEnginePlugin Plugin: ##################################################################### -qt_add_plugin(qandroidbearer +qt_add_plugin(QAndroidBearerEnginePlugin + OUTPUT_NAME qandroidbearer TYPE bearer - CLASS_NAME QAndroidBearerEnginePlugin SOURCES main.cpp qandroidbearerengine.cpp qandroidbearerengine.h diff --git a/src/plugins/bearer/connman/.prev_CMakeLists.txt b/src/plugins/bearer/connman/.prev_CMakeLists.txt index 1dc42fcce3..55aaa41491 100644 --- a/src/plugins/bearer/connman/.prev_CMakeLists.txt +++ b/src/plugins/bearer/connman/.prev_CMakeLists.txt @@ -1,12 +1,13 @@ # Generated from connman.pro. ##################################################################### -## qconnmanbearer Plugin: +## QConnmanEnginePlugin Plugin: ##################################################################### -qt_add_plugin(qconnmanbearer - TYPE bearer +qt_add_plugin(QConnmanEnginePlugin + OUTPUT_NAME qconnmanbearer CLASS_NAME QConnmanEnginePlugin + TYPE bearer SOURCES main.cpp qconnmanengine.cpp qconnmanengine.h diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt index 1dc42fcce3..6e5f34f6a4 100644 --- a/src/plugins/bearer/connman/CMakeLists.txt +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from connman.pro. ##################################################################### -## qconnmanbearer Plugin: +## QConnmanEnginePlugin Plugin: ##################################################################### -qt_add_plugin(qconnmanbearer +qt_add_plugin(QConnmanEnginePlugin + OUTPUT_NAME qconnmanbearer TYPE bearer - CLASS_NAME QConnmanEnginePlugin SOURCES main.cpp qconnmanengine.cpp qconnmanengine.h diff --git a/src/plugins/bearer/corewlan/CMakeLists.txt b/src/plugins/bearer/corewlan/CMakeLists.txt index 914f5ceae1..eda3b85499 100644 --- a/src/plugins/bearer/corewlan/CMakeLists.txt +++ b/src/plugins/bearer/corewlan/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from corewlan.pro. ##################################################################### -## qcorewlanbearer Plugin: +## QCoreWlanEnginePlugin Plugin: ##################################################################### -qt_add_plugin(qcorewlanbearer +qt_add_plugin(QCoreWlanEnginePlugin + OUTPUT_NAME qcorewlanbearer TYPE bearer - CLASS_NAME QCoreWlanEnginePlugin SOURCES main.cpp qcorewlanengine.h qcorewlanengine.mm @@ -26,7 +26,7 @@ qt_add_plugin(qcorewlanbearer ## Scopes: ##################################################################### -qt_extend_target(qcorewlanbearer CONDITION QT_FEATURE_corewlan +qt_extend_target(QCoreWlanEnginePlugin CONDITION QT_FEATURE_corewlan PUBLIC_LIBRARIES ${FWCoreWLAN} ${FWSecurity} diff --git a/src/plugins/bearer/generic/CMakeLists.txt b/src/plugins/bearer/generic/CMakeLists.txt index c41688e82a..0717b83dd3 100644 --- a/src/plugins/bearer/generic/CMakeLists.txt +++ b/src/plugins/bearer/generic/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from generic.pro. ##################################################################### -## qgenericbearer Plugin: +## QGenericEnginePlugin Plugin: ##################################################################### -qt_add_plugin(qgenericbearer +qt_add_plugin(QGenericEnginePlugin + OUTPUT_NAME qgenericbearer TYPE bearer - CLASS_NAME QGenericEnginePlugin SOURCES ../platformdefs_win.h main.cpp @@ -25,7 +25,7 @@ qt_add_plugin(qgenericbearer ## Scopes: ##################################################################### -qt_extend_target(qgenericbearer CONDITION WIN32 AND NOT WINRT +qt_extend_target(QGenericEnginePlugin CONDITION WIN32 AND NOT WINRT PUBLIC_LIBRARIES iphlpapi ) diff --git a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt index 2d86926aff..df5927024d 100644 --- a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt @@ -1,12 +1,13 @@ # Generated from networkmanager.pro. ##################################################################### -## qnmbearer Plugin: +## QNetworkManagerEnginePlugin Plugin: ##################################################################### -qt_add_plugin(qnmbearer - TYPE bearer +qt_add_plugin(QNetworkManagerEnginePlugin + OUTPUT_NAME qnmbearer CLASS_NAME QNetworkManagerEnginePlugin + TYPE bearer SOURCES main.cpp qnetworkmanagerengine.cpp qnetworkmanagerengine.h diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt index 2d86926aff..9c9721cca7 100644 --- a/src/plugins/bearer/networkmanager/CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from networkmanager.pro. ##################################################################### -## qnmbearer Plugin: +## QNetworkManagerEnginePlugin Plugin: ##################################################################### -qt_add_plugin(qnmbearer +qt_add_plugin(QNetworkManagerEnginePlugin + OUTPUT_NAME qnmbearer TYPE bearer - CLASS_NAME QNetworkManagerEnginePlugin SOURCES main.cpp qnetworkmanagerengine.cpp qnetworkmanagerengine.h -- cgit v1.2.3