From e6de6c107ebfff8488775707929ab3de49a1b2f8 Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Wed, 30 Aug 2017 13:34:00 +0200 Subject: qeditor: add workaround for c++11 in qt4, suggest to use qt5 Change-Id: Iad7b8fd171d57228796a68cb3406914213b91926 --- utils/regtools/qeditor/qeditor.pro | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'utils') diff --git a/utils/regtools/qeditor/qeditor.pro b/utils/regtools/qeditor/qeditor.pro index 5414f34..2737206 100644 --- a/utils/regtools/qeditor/qeditor.pro +++ b/utils/regtools/qeditor/qeditor.pro @@ -7,7 +7,16 @@ SOURCES += main.cpp mainwindow.cpp regtab.cpp backend.cpp analyser.cpp \ LIBS += -L../lib/ -lsocdesc -lxml2 INCLUDEPATH += ../include/ ../../hwstub/include DEPENDPATH += ../ -CONFIG += c++11 + +greaterThan(QT_MAJOR_VERSION, 4) { + # qt5 knows c++11 + CONFIG += c++11 +} +else { + message("Qt4 is deprecated, you should use Qt5") + # qt4 does not, use gcc specific code + QMAKE_CXXFLAGS += -std=c++11 +} libsocdesc.commands = cd ../lib && make QMAKE_EXTRA_TARGETS += libsocdesc -- cgit v1.1