From 08685a66e35dc0c88e9a8f1d0d9f8aa07c04339c Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 13 Dec 2015 20:47:53 +0100 Subject: [PATCH] disable new ABI (can't catch ios_base::failure with new ABI) --- CMakeLists.txt | 2 ++ general.pri | 3 +++ 2 files changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a2b447..3ac227a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,9 +153,11 @@ if(MINGW) endif(MINGW) # enable Qt Widgets GUI +# disable new ABI (can't catch ios_base::failure with new ABI) add_definitions( -DGUI_QTWIDGETS -DMODEL_UNDO_SUPPORT + -D_GLIBCXX_USE_CXX11_ABI=0 ) # check required Qt 5 modules diff --git a/general.pri b/general.pri index 7072941..f417d7d 100644 --- a/general.pri +++ b/general.pri @@ -7,6 +7,9 @@ RCC_DIR = ./res QMAKE_CXXFLAGS += -std=c++11 QMAKE_LFLAGS += -std=c++11 +# disable new ABI (can't catch ios_base::failure with new ABI) +DEFINES += _GLIBCXX_USE_CXX11_ABI=0 + # variables to check target architecture win32-g++:QMAKE_TARGET.arch = $$QMAKE_HOST.arch win32-g++-32:QMAKE_TARGET.arch = x86