From 1441c1f50d79d859a939d9cca87d1976aec2b12e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fauconnier?= Date: Mon, 13 Aug 2018 09:39:02 +0200 Subject: [PATCH] no gcc warnings and no C++11 features on windows --- OpenBoard.pro | 6 +++--- plugins/cffadaptor/src/UBCFFAdaptor.cpp | 4 ++-- src/document/UBDocumentController.cpp | 4 +++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/OpenBoard.pro b/OpenBoard.pro index 292aa2de..ce1d955a 100644 --- a/OpenBoard.pro +++ b/OpenBoard.pro @@ -9,9 +9,9 @@ CONFIG += debug_and_release \ VERSION_MAJ = 1 -VERSION_MIN = 4 -VERSION_PATCH = 1 -VERSION_TYPE = r # a = alpha, b = beta, rc = release candidate, r = release, other => error +VERSION_MIN = 5 +VERSION_PATCH = 0 +VERSION_TYPE = a # a = alpha, b = beta, rc = release candidate, r = release, other => error VERSION_BUILD = 0 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_PATCH}-$${VERSION_TYPE}.$${VERSION_BUILD}" diff --git a/plugins/cffadaptor/src/UBCFFAdaptor.cpp b/plugins/cffadaptor/src/UBCFFAdaptor.cpp index a7b25f2c..45d818e8 100644 --- a/plugins/cffadaptor/src/UBCFFAdaptor.cpp +++ b/plugins/cffadaptor/src/UBCFFAdaptor.cpp @@ -33,11 +33,11 @@ #include "UBGlobals.h" #include "UBCFFConstants.h" -THIRD_PARTY_WARNINGS_DISABLE +//THIRD_PARTY_WARNINGS_DISABLE #include "quazip.h" #include "quazipfile.h" #include "quazipfileinfo.h" -THIRD_PARTY_WARNINGS_ENABLE +//THIRD_PARTY_WARNINGS_ENABLE UBCFFAdaptor::UBCFFAdaptor() {} diff --git a/src/document/UBDocumentController.cpp b/src/document/UBDocumentController.cpp index 062d54fd..b0b8929d 100644 --- a/src/document/UBDocumentController.cpp +++ b/src/document/UBDocumentController.cpp @@ -2004,7 +2004,9 @@ void UBDocumentController::setupViews() //set sizes (left and right sides of the splitter) for the splitter here because it cannot be done in the form editor. const int leftSplitterSize = 100; const int rightSplitterSize = 1200; - QList splitterSizes = { leftSplitterSize, rightSplitterSize }; + QList splitterSizes; + splitterSizes.append(leftSplitterSize); + splitterSizes.append(rightSplitterSize); mDocumentUI->splitter->setSizes(splitterSizes); //mDocumentUI->documentTreeView->hideColumn(1);