diff --git a/OpenBoard.pro b/OpenBoard.pro index d9147b59..f08e499a 100644 --- a/OpenBoard.pro +++ b/OpenBoard.pro @@ -102,6 +102,8 @@ MOC_DIR = $$BUILD_DIR/moc RCC_DIR = $$BUILD_DIR/rcc UI_DIR = $$BUILD_DIR/ui +QMAKE_CXXFLAGS += -std=c++11 + win32 { RC_FILE = resources/win/OpenBoard.rc CONFIG += qaxcontainer diff --git a/src/domain/UBGraphicsDelegateFrame.h b/src/domain/UBGraphicsDelegateFrame.h index d98feac4..599fca5e 100644 --- a/src/domain/UBGraphicsDelegateFrame.h +++ b/src/domain/UBGraphicsDelegateFrame.h @@ -68,7 +68,6 @@ class UBGraphicsDelegateFrame: public QGraphicsRectItem, public QObject QList getLinkedFrames(); private: - qreal mTitleBarHeight; QRectF bottomRightResizeGripRect() const; QRectF bottomResizeGripRect() const; QRectF leftResizeGripRect() const; @@ -143,6 +142,7 @@ class UBGraphicsDelegateFrame: public QGraphicsRectItem, public QObject bool mResizing; bool mMirroredXAtStart; bool mMirroredYAtStart; + qreal mTitleBarHeight; QList mLinkedFrames; }; diff --git a/src/domain/UBGraphicsTextItem.cpp b/src/domain/UBGraphicsTextItem.cpp index 77cab71e..a9f949b2 100644 --- a/src/domain/UBGraphicsTextItem.cpp +++ b/src/domain/UBGraphicsTextItem.cpp @@ -44,9 +44,9 @@ QColor UBGraphicsTextItem::lastUsedTextColor; UBGraphicsTextItem::UBGraphicsTextItem(QGraphicsItem * parent) : QGraphicsTextItem(parent) , UBGraphicsItem() + , mTypeTextHereLabel(tr("")) , mMultiClickState(0) , mLastMousePressTime(QTime::currentTime()) - , mTypeTextHereLabel(tr("")) , isActivatedTextEditor(true) { setDelegate(new UBGraphicsTextItemDelegate(this, 0));