From d7caa5804e8637e50c67066973ceee77cb023931 Mon Sep 17 00:00:00 2001 From: kelteseth Date: Fri, 28 Apr 2017 14:45:31 +0200 Subject: [PATCH] Add missing monitors files and QtAV submodule --- .gitmodules | 3 +++ ScreenPlay.pro | 42 +++++++++++++++++------------------------- ThirdParty/QtAV | 1 + 3 files changed, 21 insertions(+), 25 deletions(-) create mode 100644 .gitmodules create mode 160000 ThirdParty/QtAV diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..9f0e909e --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "ThirdParty/QtAV"] + path = ThirdParty/QtAV + url = https://github.com/wang-bin/QtAV.git diff --git a/ScreenPlay.pro b/ScreenPlay.pro index 879583b5..9c1109e5 100644 --- a/ScreenPlay.pro +++ b/ScreenPlay.pro @@ -1,19 +1,32 @@ TEMPLATE = app QT += qml quick av widgets -CONFIG += c++14 +CONFIG += c++14 QtAV SOURCES += main.cpp \ src/screenplay.cpp \ src/steamworkshop.cpp \ src/installedlistmodel.cpp \ src/backend.cpp \ - src/monitors.cpp \ - -include(ThirdParty/qsyncable/qsyncable.pri) + src/monitorlistmodel.cpp RESOURCES += qml.qrc +HEADERS += \ + src/screenplay.h \ + src/steamworkshop.h \ + src/installedlistmodel.h \ + src/backend.h \ + src/monitorlistmodel.h + +INCLUDEPATH += \ + $$PWD/ThirdParty/Steam/ \ + $$PWD/src/\ + +DISTFILES += \ + steam_appid.txt \ + assets/icons/favicon.ico + # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH += [QtAVSourceCodeDir]/qml @@ -26,26 +39,11 @@ QML_DESIGNER_IMPORT_PATH = # deprecated API in order to know how to port your code away from it. DEFINES += QT_DEPRECATED_WARNINGS -# You can also make your code fail to compile if you use deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - # Default rules for deployment. qnx: target.path = /tmp/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target -HEADERS += \ - src/screenplay.h \ - src/steamworkshop.h \ - src/installedlistmodel.h \ - src/backend.h \ - src/monitors.h \ - -INCLUDEPATH += $$PWD/ThirdParty/Steam/ -INCLUDEPATH += $$PWD/src/ - #contains(QT_ARCH, i386) { # #32-bit # win32: LIBS += -L$$PWD/ThirdParty/Steam/redistributable_bin/ -lsteam_api @@ -56,9 +54,3 @@ INCLUDEPATH += $$PWD/src/ # DEPENDPATH += $$PWD/ThirdParty/Steam/redistributable_bin/win64 #} -DISTFILES += \ - steam_appid.txt \ - assets/icons/favicon.ico - - - diff --git a/ThirdParty/QtAV b/ThirdParty/QtAV new file mode 160000 index 00000000..e22230b9 --- /dev/null +++ b/ThirdParty/QtAV @@ -0,0 +1 @@ +Subproject commit e22230b9c89facec1f6727cd63b6667568f26534