From dcccf32095dfe9e2d544eed931a61c240abd7d03 Mon Sep 17 00:00:00 2001
From: Holger Ihrig <holger.ihrig@digia.com>
Date: Fri, 30 Nov 2012 14:10:26 +0100
Subject: Fixed compatibility problem with Exceptionhandling

When QtBase is compiled with Exeptions it was incompatible
with the other modules compiled with QT_NO_EXCEPTIONS.
This resulted in a linker error with
ExceptionStore::throwPossibleExceptions, one time returning a const value
and the other time without it

Change-Id: I0e0dff61aceeec3cfde119b00ed15f3aa9f12659
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/corelib/thread/qexception.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/corelib/thread')

diff --git a/src/corelib/thread/qexception.h b/src/corelib/thread/qexception.h
index 7106bb57df..d24b291c4c 100644
--- a/src/corelib/thread/qexception.h
+++ b/src/corelib/thread/qexception.h
@@ -108,7 +108,7 @@ class Q_CORE_EXPORT ExceptionStore
 {
 public:
     ExceptionStore() { }
-    inline void throwPossibleException() const {}
+    inline void throwPossibleException() {}
 };
 
 } // namespace QtPrivate
-- 
cgit v1.2.3