mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-01-23 18:14:51 +08:00
110 lines
2.7 KiB
Diff
110 lines
2.7 KiB
Diff
From 992761b6c71740729c05f6312b8f46ae036e3186 Mon Sep 17 00:00:00 2001
|
|
From: BrLi <rainman59118@gmail.com>
|
|
Date: Sat, 24 Feb 2018 20:45:34 +0800
|
|
Subject: [PATCH] remove qtermwidget
|
|
|
|
---
|
|
notifier/octopi-notifier/octopi-notifier.pro | 16 ++--------------
|
|
octopi.pro | 16 ++--------------
|
|
2 files changed, 4 insertions(+), 28 deletions(-)
|
|
|
|
diff --git a/notifier/octopi-notifier/octopi-notifier.pro b/notifier/octopi-notifier/octopi-notifier.pro
|
|
index a3902e2..c6c3a86 100644
|
|
--- a/notifier/octopi-notifier/octopi-notifier.pro
|
|
+++ b/notifier/octopi-notifier/octopi-notifier.pro
|
|
@@ -8,8 +8,8 @@ QT += core xml gui network dbus
|
|
|
|
# This controls whether octopi-notifier uses KStatusNotifier lib
|
|
# You SHOULD REALLY enable KSTATUS define in plasma 5 desktops!
|
|
-DEFINES += ALPM_BACKEND QTERMWIDGET #KSTATUS
|
|
-CONFIG += qt warn_on debug link_pkgconfig ALPM_BACKEND QTERMWIDGET
|
|
+DEFINES += ALPM_BACKEND #KSTATUS
|
|
+CONFIG += qt warn_on debug link_pkgconfig ALPM_BACKEND
|
|
|
|
ALPM_BACKEND {
|
|
QMAKE_CXXFLAGS += -std=c++11
|
|
@@ -19,10 +19,6 @@ ALPM_BACKEND {
|
|
QMAKE_CXXFLAGS += -std=c++11
|
|
}
|
|
|
|
-QTERMWIDGET {
|
|
- LIBS += -lqtermwidget5
|
|
-}
|
|
-
|
|
contains(DEFINES, KSTATUS){
|
|
QT += KNotifications
|
|
}
|
|
@@ -56,10 +52,6 @@ HEADERS += \
|
|
../../src/searchbar.h \
|
|
../../src/optionsdialog.h
|
|
|
|
-QTERMWIDGET{
|
|
- HEADERS += ../../src/termwidget.h
|
|
-}
|
|
-
|
|
ALPM_BACKEND{
|
|
HEADERS += ../../src/alpmbackend.h
|
|
}
|
|
@@ -82,10 +74,6 @@ SOURCES += main.cpp \
|
|
../../src/searchbar.cpp \
|
|
../../src/optionsdialog.cpp
|
|
|
|
-QTERMWIDGET{
|
|
- SOURCES += ../../src/termwidget.cpp
|
|
-}
|
|
-
|
|
ALPM_BACKEND{
|
|
SOURCES += ../../src/alpmbackend.cpp
|
|
}
|
|
diff --git a/octopi.pro b/octopi.pro
|
|
index 815ea21..f8ac381 100644
|
|
--- a/octopi.pro
|
|
+++ b/octopi.pro
|
|
@@ -5,8 +5,8 @@
|
|
#-------------------------------------------------
|
|
|
|
QT += core gui network xml dbus widgets
|
|
-DEFINES += OCTOPI_EXTENSIONS ALPM_BACKEND QTERMWIDGET
|
|
-CONFIG += qt warn_on debug link_pkgconfig ALPM_BACKEND QTERMWIDGET
|
|
+DEFINES += OCTOPI_EXTENSIONS ALPM_BACKEND
|
|
+CONFIG += qt warn_on debug link_pkgconfig ALPM_BACKEND
|
|
|
|
ALPM_BACKEND {
|
|
QMAKE_CXXFLAGS += -std=c++11
|
|
@@ -16,10 +16,6 @@ ALPM_BACKEND {
|
|
QMAKE_CXXFLAGS += -std=c++11
|
|
}
|
|
|
|
-QTERMWIDGET {
|
|
- LIBS += -lqtermwidget5
|
|
-}
|
|
-
|
|
TEMPLATE = app
|
|
DESTDIR += bin
|
|
OBJECTS_DIR += build
|
|
@@ -53,10 +49,6 @@ HEADERS += src/QtSolutions/qtsingleapplication.h \
|
|
src/constants.h \
|
|
src/optionsdialog.h
|
|
|
|
-QTERMWIDGET{
|
|
- HEADERS += src/termwidget.h
|
|
-}
|
|
-
|
|
ALPM_BACKEND{
|
|
HEADERS += src/alpmbackend.h
|
|
}
|
|
@@ -94,10 +86,6 @@ SOURCES += src/QtSolutions/qtsingleapplication.cpp \
|
|
src/pacmanexec.cpp \
|
|
src/optionsdialog.cpp
|
|
|
|
-QTERMWIDGET{
|
|
- SOURCES += src/termwidget.cpp
|
|
-}
|
|
-
|
|
ALPM_BACKEND{
|
|
SOURCES += src/alpmbackend.cpp
|
|
}
|
|
--
|
|
2.16.2
|
|
|