From d6cbd47b6d8804072059becfdbad6ddf858adcd3 Mon Sep 17 00:00:00 2001 From: Elias Steurer Date: Mon, 27 Aug 2018 13:39:47 +0200 Subject: [PATCH] Fix compilation with msvc 2017 --- ScreenPlay/Resources.qrc | 2 -- ScreenPlay/ScreenPlay.pro | 2 +- ScreenPlay/main.cpp | 2 +- ScreenPlay/src/monitorlistmodel.cpp | 1 + ScreenPlay/src/steamworkshoplistmodel.cpp | 4 ++++ 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ScreenPlay/Resources.qrc b/ScreenPlay/Resources.qrc index a7a1cd49..6c102e93 100644 --- a/ScreenPlay/Resources.qrc +++ b/ScreenPlay/Resources.qrc @@ -104,8 +104,6 @@ assets/icons/icon_library_music.svg assets/icons/icon_time.svg assets/icons/icon_emptyWidget.svg - translations/ScreenPlay_de.qm - translations/ScreenPlay_en.qm qml/Create/CreateNew.qml assets/icons/icon_open_in_new.svg diff --git a/ScreenPlay/ScreenPlay.pro b/ScreenPlay/ScreenPlay.pro index 7da15132..a40c4a10 100644 --- a/ScreenPlay/ScreenPlay.pro +++ b/ScreenPlay/ScreenPlay.pro @@ -1,7 +1,7 @@ TEMPLATE = app QT += qml quick widgets quickcontrols2 core CONFIG += c++17 -CONFIG += qtquickcompiler +#CONFIG += qtquickcompiler #DEFINES += QT_NO_DEBUG_OUTPUT QT_NO_WARNING_OUTPUT msvc: LIBS += -luser32 TARGETPATH = ScreenPlay diff --git a/ScreenPlay/main.cpp b/ScreenPlay/main.cpp index a9bb2717..2716e187 100644 --- a/ScreenPlay/main.cpp +++ b/ScreenPlay/main.cpp @@ -39,7 +39,7 @@ #include "ThirdParty/steam/steam_api.h" #include "src/steamworkshop.h" #include "src/steamworkshoplistmodel.h" -#include "globalconstans.h" + int main(int argc, char* argv[]) { diff --git a/ScreenPlay/src/monitorlistmodel.cpp b/ScreenPlay/src/monitorlistmodel.cpp index 4922a750..c3cafc1a 100644 --- a/ScreenPlay/src/monitorlistmodel.cpp +++ b/ScreenPlay/src/monitorlistmodel.cpp @@ -138,6 +138,7 @@ bool MonitorListModel::getMonitorListItemAt(int position, Monitor* monitor) // *monitor = m_monitorList.at(position); // return true; // } + return true; } void MonitorListModel::screenAdded(QScreen* screen) diff --git a/ScreenPlay/src/steamworkshoplistmodel.cpp b/ScreenPlay/src/steamworkshoplistmodel.cpp index c55b06a3..895b6dd0 100644 --- a/ScreenPlay/src/steamworkshoplistmodel.cpp +++ b/ScreenPlay/src/steamworkshoplistmodel.cpp @@ -19,6 +19,7 @@ QHash SteamWorkshopListModel::roleNames() const QVariant SteamWorkshopListModel::headerData(int section, Qt::Orientation orientation, int role) const { // FIXME: Implement me! + return QVariant(); } bool SteamWorkshopListModel::setHeaderData(int section, Qt::Orientation orientation, const QVariant& value, int role) @@ -130,7 +131,9 @@ bool SteamWorkshopListModel::insertRows(int row, int count, const QModelIndex& p { beginInsertRows(parent, row, row + count - 1); // FIXME: Implement me! + endInsertRows(); + return true; } bool SteamWorkshopListModel::removeRows(int row, int count, const QModelIndex& parent) @@ -138,4 +141,5 @@ bool SteamWorkshopListModel::removeRows(int row, int count, const QModelIndex& p beginRemoveRows(parent, row, row + count - 1); // FIXME: Implement me! endRemoveRows(); + return true; }