Commit ee62e8f6 authored by Joerg Bornemann's avatar Joerg Bornemann
Browse files

fix CLucene build for MSVC 2013


Commit qtbase/9f0e5d00ab51cc7c0dc87c8d72f48c4e6edaf120 added the
/Zc:strictStrings compiler option to MSVC 2013 builds.
We're circumventing the problem by throwing const_casts into the code.

Change-Id: I45cc647b780f834b756caed92c4d6f9a50a53664
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: default avatarKarsten Heimrich <karsten.heimrich@digia.com>
Showing with 4 additions and 2 deletions
...@@ -24,8 +24,10 @@ ...@@ -24,8 +24,10 @@
CL_NS_USE(util) CL_NS_USE(util)
TCHAR* _LUCENE_BLANK_STRING = _T(""); const TCHAR *_CONST_LUCENE_BLANK_STRING = _T("");
char* _LUCENE_BLANK_ASTRING = ""; const char *_CONST_LUCENE_BLANK_ASTRING = "";
TCHAR* _LUCENE_BLANK_STRING = const_cast<TCHAR *>(_CONST_LUCENE_BLANK_STRING);
char* _LUCENE_BLANK_ASTRING = const_cast<char *>(_CONST_LUCENE_BLANK_ASTRING);
#ifndef Q_CC_MIPS #ifndef Q_CC_MIPS
#if defined(_LUCENE_THREADMUTEX_USINGDEFAULT) #if defined(_LUCENE_THREADMUTEX_USINGDEFAULT)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment