no gcc warnings and no C++11 features on windows

preferencesAboutTextFull
Clément Fauconnier 6 years ago
parent a69d1b39f1
commit 1441c1f50d
  1. 6
      OpenBoard.pro
  2. 4
      plugins/cffadaptor/src/UBCFFAdaptor.cpp
  3. 4
      src/document/UBDocumentController.cpp

@ -9,9 +9,9 @@ CONFIG += debug_and_release \
VERSION_MAJ = 1 VERSION_MAJ = 1
VERSION_MIN = 4 VERSION_MIN = 5
VERSION_PATCH = 1 VERSION_PATCH = 0
VERSION_TYPE = r # a = alpha, b = beta, rc = release candidate, r = release, other => error VERSION_TYPE = a # a = alpha, b = beta, rc = release candidate, r = release, other => error
VERSION_BUILD = 0 VERSION_BUILD = 0
VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_PATCH}-$${VERSION_TYPE}.$${VERSION_BUILD}" VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_PATCH}-$${VERSION_TYPE}.$${VERSION_BUILD}"

@ -33,11 +33,11 @@
#include "UBGlobals.h" #include "UBGlobals.h"
#include "UBCFFConstants.h" #include "UBCFFConstants.h"
THIRD_PARTY_WARNINGS_DISABLE //THIRD_PARTY_WARNINGS_DISABLE
#include "quazip.h" #include "quazip.h"
#include "quazipfile.h" #include "quazipfile.h"
#include "quazipfileinfo.h" #include "quazipfileinfo.h"
THIRD_PARTY_WARNINGS_ENABLE //THIRD_PARTY_WARNINGS_ENABLE
UBCFFAdaptor::UBCFFAdaptor() UBCFFAdaptor::UBCFFAdaptor()
{} {}

@ -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. //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 leftSplitterSize = 100;
const int rightSplitterSize = 1200; const int rightSplitterSize = 1200;
QList<int> splitterSizes = { leftSplitterSize, rightSplitterSize }; QList<int> splitterSizes;
splitterSizes.append(leftSplitterSize);
splitterSizes.append(rightSplitterSize);
mDocumentUI->splitter->setSizes(splitterSizes); mDocumentUI->splitter->setSizes(splitterSizes);
//mDocumentUI->documentTreeView->hideColumn(1); //mDocumentUI->documentTreeView->hideColumn(1);

Loading…
Cancel
Save