kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-19 23:20:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add flags for qmake to use C++11

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3079 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2014-05-26 14:42:00 +00:00
parent 215e268467
commit 9d9f6bd0db
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qelectrotech.pro
View File

@@ -100,6 +100,9 @@ TARGET = qelectrotech
# Ajustement des bibliotheques utilisees lors de l'edition des liens # Ajustement des bibliotheques utilisees lors de l'edition des liens
unix:QMAKE_LIBS_THREAD -= -lpthread unix:QMAKE_LIBS_THREAD -= -lpthread
# Enable C++11
QMAKE_CXXFLAGS += -std=c++11
# Description de l'installation # Description de l'installation
target.path = $$join(INSTALL_PREFIX,,,$${QET_BINARY_PATH}) target.path = $$join(INSTALL_PREFIX,,,$${QET_BINARY_PATH})

4
sources/qetgraphicsitem/masterelement.cpp
View File

@@ -29,7 +29,7 @@ MasterElement::MasterElement(const ElementsLocation &location, QGraphicsItem *qg
CustomElement(location, qgi, s, state) CustomElement(location, qgi, s, state)
{ {
link_type_ = Master; link_type_ = Master;
cri_ = 0; cri_ = nullptr;
connect(this, SIGNAL(elementInfoChange(DiagramContext)), this, SLOT(updateLabel())); connect(this, SIGNAL(elementInfoChange(DiagramContext)), this, SLOT(updateLabel()));
} }
@@ -93,7 +93,7 @@ void MasterElement::unlinkElement(Element *elmt) {
if (linkedElements().isEmpty()) { if (linkedElements().isEmpty()) {
diagram()->removeItem(cri_); diagram()->removeItem(cri_);
delete cri_; delete cri_;
cri_ = 0; cri_ = nullptr;
} }
else { else {
cri_->updateLabel(); cri_->updateLabel();