summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVolker Grabsch <vog@notjusthosting.com>2009-10-04 20:00:37 (GMT)
committerVolker Grabsch <vog@notjusthosting.com>2009-10-04 20:00:37 (GMT)
commit38750f38c72cd20272ce150842d79fd391e67440 (patch)
tree1a32462f5abd94aa4ebb11391a9923b374df1c89 /src
parent4e6cfe8028b1ddaca3ce0f0bedb89d76eaa84a95 (diff)
downloadmxe-38750f38c72cd20272ce150842d79fd391e67440.zip
mxe-38750f38c72cd20272ce150842d79fd391e67440.tar.gz
mxe-38750f38c72cd20272ce150842d79fd391e67440.tar.bz2
in the qt-win32 patch, don't override the effect of a potential configure option "-no-exception"
This makes it easier to switch between "-exception" and "-no-exception" in "src/qt.mk".
Diffstat (limited to 'src')
-rw-r--r--src/qt-win32.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt-win32.patch b/src/qt-win32.patch
index 71c5794..d2a5c65 100644
--- a/src/qt-win32.patch
+++ b/src/qt-win32.patch
@@ -88,7 +88,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
MAKEFILE_GENERATOR = MINGW
TEMPLATE = app
CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header
-+CONFIG += exceptions windows win32
++CONFIG += windows win32
+CONFIG -= freetype
+QT_CONFIG -= freetype
QT += core gui