No explicit g++-5

richelbilderbeek · Aug 2, 2019 · a72d4b9 · a72d4b9
1 parent 5066463
commit a72d4b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/travis_qmake_gcc_cpp11_boost_test.pro b/travis_qmake_gcc_cpp11_boost_test.pro
@@ -6,8 +6,6 @@ CONFIG(release, debug|release) {
   DEFINES += NDEBUG
 }
 
-QMAKE_CXX = g++-5
-QMAKE_LINK = g++-5
-QMAKE_CC = gcc-5
-QMAKE_CXXFLAGS += -Wall -Wextra -Weffc++ -Werror -std=c++11
-
+# C++11
+CONFIG += c++11
+QMAKE_CXXFLAGS += -std=c++11
diff --git a/travis_qmake_gcc_cpp11_boost_test_test.pro b/travis_qmake_gcc_cpp11_boost_test_test.pro
@@ -11,11 +11,8 @@ SOURCES += my_functions.cpp
 SOURCES += main_test.cpp my_functions_test.cpp
 
 # C++11
-unix {
-  QMAKE_CXX = g++-5
-  QMAKE_LINK = g++-5
-  QMAKE_CC = gcc-5
-}
+CONFIG += c++11
+QMAKE_CXXFLAGS += -std=c++11
 
 # Boost.Test does not go well with -Weffc++
 QMAKE_CXXFLAGS += -Wall -Wextra -Werror -std=c++11