diff --git a/dde-touchscreen-dialog/src/main.cpp b/dde-touchscreen-dialog/src/main.cpp index ade16e9b..4e4530a0 100644 --- a/dde-touchscreen-dialog/src/main.cpp +++ b/dde-touchscreen-dialog/src/main.cpp @@ -52,15 +52,7 @@ int main(int argc, char *argv[]) return -1; } - // 如果该触摸设备已被关联到屏幕,则不再弹出选择窗口 - const QString &touchUUID = posArguments.first(); - const auto touchMap = display.touchMap(); - if (touchMap.contains(touchUUID)) { - qDebug() << "touchscreen already associated:" << touchUUID << "->" << touchMap[touchUUID]; - return 0; - } - - TouchscreenSetting s(touchUUID); + TouchscreenSetting s(posArguments.first()); #if (defined QT_DEBUG) && (defined CHECK_ACCESSIBLENAME) AccessibilityCheckerEx checker; checker.setOutputFormat(DAccessibilityChecker::FullFormat); diff --git a/debian/rules b/debian/rules index e5ea543c..2ca38175 100755 --- a/debian/rules +++ b/debian/rules @@ -6,8 +6,6 @@ export QT_SELECT=5 include /usr/share/dpkg/default.mk -SYSTYPE=Desktop -SYSTYPE=$(shell cat /etc/deepin-version | grep Type= | awk -F'=' '{print $$2}') export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_CFLAGS_MAINT_APPEND = -Wall export DEB_CXXFLAGS_MAINT_APPEND = -Wall @@ -37,9 +35,3 @@ override_dh_auto_configure: dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS) SHUTDOWN_NO_QUIT=YES LOCK_NO_QUIT=YES DISABLE_DEMO_VIDEO=YES DISABLE_TEXT_SHADOW=YES DISABLE_ANIMATIONS=YES USE_CURSOR_LOADING_ANI=YES endif -ifeq ($(SYSTYPE), Professional) -ifeq ($(DEB_BUILD_ARCH), amd64) -override_dh_gencontrol: - dh_gencontrol -- -Vdist:Depends="pbis-open" -endif -endif