From 9d9f6bd0db3a384b5a5b2928fef95eadfd769084 Mon Sep 17 00:00:00 2001 From: blacksun Date: Mon, 26 May 2014 14:42:00 +0000 Subject: [PATCH] Add flags for qmake to use C++11 git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3079 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- qelectrotech.pro | 3 +++ sources/qetgraphicsitem/masterelement.cpp | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/qelectrotech.pro b/qelectrotech.pro index ff0df6d20..0382ab7bf 100644 --- a/qelectrotech.pro +++ b/qelectrotech.pro @@ -100,6 +100,9 @@ TARGET = qelectrotech # Ajustement des bibliotheques utilisees lors de l'edition des liens unix:QMAKE_LIBS_THREAD -= -lpthread +# Enable C++11 +QMAKE_CXXFLAGS += -std=c++11 + # Description de l'installation target.path = $$join(INSTALL_PREFIX,,,$${QET_BINARY_PATH}) diff --git a/sources/qetgraphicsitem/masterelement.cpp b/sources/qetgraphicsitem/masterelement.cpp index e0be5514d..8c9df30fe 100644 --- a/sources/qetgraphicsitem/masterelement.cpp +++ b/sources/qetgraphicsitem/masterelement.cpp @@ -29,7 +29,7 @@ MasterElement::MasterElement(const ElementsLocation &location, QGraphicsItem *qg CustomElement(location, qgi, s, state) { link_type_ = Master; - cri_ = 0; + cri_ = nullptr; connect(this, SIGNAL(elementInfoChange(DiagramContext)), this, SLOT(updateLabel())); } @@ -93,7 +93,7 @@ void MasterElement::unlinkElement(Element *elmt) { if (linkedElements().isEmpty()) { diagram()->removeItem(cri_); delete cri_; - cri_ = 0; + cri_ = nullptr; } else { cri_->updateLabel();