Skip to content

Commit 533c3d8

Browse files
committed
fix: can't connect wifi for tray
Remove NMQT_STATIC, it's used in test. Add ENABLE_DEEPIN_NMQT in rules. issue: linuxdeepin/developer-center#7880
1 parent 3b0ab5f commit 533c3d8

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

debian/rules

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ include /usr/share/dpkg/default.mk
44

55
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
66

7+
DISTRO = $(shell lsb_release -is)
8+
ifeq ($(DISTRO),Deepin)
9+
ENABLE_DEEPIN_NMQT=ON
10+
else
11+
ENABLE_DEEPIN_NMQT=OFF
12+
endif
13+
714
VERSION = $(DEB_VERSION_UPSTREAM)
815
PACK_VER = $(shell echo $(VERSION) | awk -F'[+_~-]' '{print $$1}')
916
# Fix: invalid digit "8" in octal constant. e.g. u008 ==> 008 ==> 8
@@ -13,4 +20,4 @@ BUILD_VER = $(shell echo $(VERSION) | awk -F'[+_~-]' '{print $$2}' | sed 's/[^0-
1320
dh $@
1421

1522
override_dh_auto_configure:
16-
dh_auto_configure -- -DDS_VERSION=${PACK_VER}
23+
dh_auto_configure -- -DDS_VERSION=${PACK_VER} -DENABLE_DEEPIN_NMQT=${ENABLE_DEEPIN_NMQT}

panels/dock/tray/networkmanager-qt/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ set_target_properties(KF5NetworkManagerQt PROPERTIES VERSION ${NETWORKMANAGERQT_
163163

164164
########### static lib for tests ###############
165165
add_library(KF5NetworkManagerQt_static STATIC ${NetworkManagerQt_PART_SRCS} ${NetworkManagerQt_SETTINGS_SRCS} ${DBUS_INTERFACE_SRCS})
166-
set_target_properties(KF5NetworkManagerQt_static PROPERTIES COMPILE_FLAGS -DNMQT_STATIC=1)
166+
# set_target_properties(KF5NetworkManagerQt_static PROPERTIES COMPILE_FLAGS -DNMQT_STATIC=1)
167167
set_target_properties(KF5NetworkManagerQt_static PROPERTIES POSITION_INDEPENDENT_CODE ON)
168168

169169
target_link_libraries(KF5NetworkManagerQt_static PUBLIC Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Network Qt${QT_MAJOR_VERSION}::DBus PkgConfig::NetworkManager PkgConfig::Gio)

panels/dock/tray/plugins/dde-network-core/dock-network-plugin/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ add_custom_target(language ALL DEPENDS ${QM_FILES})
2121

2222
add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
2323
add_library(${PLUGIN_NAME} SHARED ${SRCS} ../common-plugin/network.qrc)
24+
set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../../quick-trays)
2425

2526
target_include_directories(${PLUGIN_NAME} PUBLIC
2627
${NETINTERFACEINCLUDE}

0 commit comments

Comments
 (0)