[X2Go-Commits] [x2gokdriveclient] 07/07: x2gokdriveclient.pro: adapt to new layout.
git-admin at x2go.org
git-admin at x2go.org
Fri Feb 24 17:56:49 CET 2023
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gokdriveclient.
commit 33b742294bfe03729c47da0e2a292a2086c39dff
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri Feb 24 17:56:32 2023 +0100
x2gokdriveclient.pro: adapt to new layout.
---
debian/changelog | 1 +
x2gokdriveclient.pro | 22 ++++++++++++++++------
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 53ee657..e265e91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -97,6 +97,7 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
locations.
- res/: move image files to res/img/.
- src/{client,extwin,menuframe}.cpp: add img/ prefix to image files.
+ - x2gokdriveclient.pro: adapt to new layout.
* debian/rules:
+ Let qmake add general Qt {C{,XX},L}FLAGS instead of overriding them.
Especially needed for C++11 support.
diff --git a/x2gokdriveclient.pro b/x2gokdriveclient.pro
index 6ef1844..ea92480 100644
--- a/x2gokdriveclient.pro
+++ b/x2gokdriveclient.pro
@@ -4,7 +4,7 @@
TEMPLATE = app
TARGET = x2gokdriveclient
-INCLUDEPATH += .
+INCLUDEPATH += src
CONFIG += console c++11
QT += widgets
@@ -16,16 +16,26 @@ QT += x11extras
LIBS += -lxcb -lxcb-xfixes
}
-RESOURCES += resources.qrc
+RESOURCES += res/resources.qrc
# Input
-SOURCES += main.cpp client.cpp displayarea.cpp menuframe.cpp screenidentifier.cpp extwin.cpp
-HEADERS += client.h displayarea.h menuframe.h screenidentifier.h extwin.h
+HEADERS += src/client.h \
+ src/displayarea.h \
+ src/menuframe.h \
+ src/screenidentifier.h \
+ src/extwin.h
+
+SOURCES += src/main.cpp \
+ src/client.cpp \
+ src/displayarea.cpp \
+ src/menuframe.cpp \
+ src/screenidentifier.cpp \
+ src/extwin.cpp
linux {
-SOURCES += xcbclip.cpp
-HEADERS += xcbclip.h
+HEADERS += src/xcbclip.h
+SOURCES += src/xcbclip.cpp
}
windows {
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git
More information about the x2go-commits
mailing list