Merge pull request #45 from thp/gcc46-compat

[toolchain] Revert C++11 changes for GCC 4.6 compatibility
sailfishos · Mar 22, 2015 · 3d4d1cb · 3d4d1cb
2 parents a529d56 + dff94c4
commit 3d4d1cb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/ssuurlresolver/ssuurlresolver.pro b/ssuurlresolver/ssuurlresolver.pro
@@ -9,9 +9,6 @@ target.path = /usr/lib/zypp/plugins/urlresolver
 QT += network
 CONFIG += link_pkgconfig
 
-# Needed for recent versions of libzypp
-QMAKE_CXXFLAGS += -std=c++11
-
 HEADERS = ssuurlresolver.h
 SOURCES = main.cpp \
         ssuurlresolver.cpp

diff --git a/tests/ut_ssucli/ut_ssucli.pro b/tests/ut_ssucli/ut_ssucli.pro
@@ -17,7 +17,4 @@ test_data_usr_share.files = \
         testdata/repos.ini \
 
 test_data_boardmappings_d.files = \
-        testdata/board-mappings.ini \
-
-# Needed for recent versions of libzypp
-QMAKE_CXXFLAGS += -std=c++11
+        testdata/board-mappings.ini \
diff --git a/tests/ut_ssuurlresolver/ut_ssuurlresolver.pro b/tests/ut_ssuurlresolver/ut_ssuurlresolver.pro
@@ -20,7 +20,4 @@ test_data_usr_share.files = \
         testdata/repos.ini \
 
 test_data_boardmappings_d.files = \
-        testdata/board-mappings.ini \
-
-# Needed for recent versions of libzypp
-QMAKE_CXXFLAGS += -std=c++11
+        testdata/board-mappings.ini \