summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2017-08-30 13:34:00 +0200
committerAmaury Pouly <amaury.pouly@gmail.com>2017-09-06 20:45:34 +0200
commite6de6c107ebfff8488775707929ab3de49a1b2f8 (patch)
tree1e94d1a6ae8110606abb4d685eab7d3ff4874362
parent1d58667c1ff430bd7aba1417b702d68544fb8c13 (diff)
downloadrockbox-e6de6c107ebfff8488775707929ab3de49a1b2f8.tar.gz
rockbox-e6de6c107ebfff8488775707929ab3de49a1b2f8.zip
qeditor: add workaround for c++11 in qt4, suggest to use qt5
Change-Id: Iad7b8fd171d57228796a68cb3406914213b91926
-rw-r--r--utils/regtools/qeditor/qeditor.pro11
1 files changed, 10 insertions, 1 deletions
diff --git a/utils/regtools/qeditor/qeditor.pro b/utils/regtools/qeditor/qeditor.pro
index 5414f34e72..2737206ab3 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