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 --- .../bearer/networkmanager/.prev_CMakeLists.txt | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 src/plugins/bearer/networkmanager/.prev_CMakeLists.txt (limited to 'src/plugins/bearer/networkmanager/.prev_CMakeLists.txt') 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" -- 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/networkmanager/.prev_CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'src/plugins/bearer/networkmanager/.prev_CMakeLists.txt') 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/networkmanager/.prev_CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/bearer/networkmanager/.prev_CMakeLists.txt') 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 -- 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/networkmanager/.prev_CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/plugins/bearer/networkmanager/.prev_CMakeLists.txt') 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 ) -- 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/networkmanager/.prev_CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/plugins/bearer/networkmanager/.prev_CMakeLists.txt') 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 -- cgit v1.2.3