diff options
| author | Holger Ihrig <holger.ihrig@digia.com> | 2012-11-30 14:10:26 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-30 21:57:49 +0100 |
| commit | dcccf32095dfe9e2d544eed931a61c240abd7d03 (patch) | |
| tree | 62ef9d1e47de106ae41c2a2546ce6f9a810aaca0 /src/corelib/thread | |
| parent | 1c54dcf3bbd195884035f57bdd76b36e1173d627 (diff) | |
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>
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qexception.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |