diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-02 08:54:38 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-02 08:54:38 (GMT) |
| commit | b31819a2871f0479da59c01d9fc7469d36120c2b (patch) | |
| tree | 66a52c719c144295a3adf9d6d7b4cff3a63c13ea /tools/assistant | |
| parent | d52fb58f34199e9a6e008929425cd21b92a2674a (diff) | |
| parent | d018549a25761b5e50d90939d94384f23d7a01e0 (diff) | |
| download | Qt-b31819a2871f0479da59c01d9fc7469d36120c2b.zip Qt-b31819a2871f0479da59c01d9fc7469d36120c2b.tar.gz Qt-b31819a2871f0479da59c01d9fc7469d36120c2b.tar.bz2 | |
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tests/auto/selftests/expected_skip.txt
tests/auto/selftests/tst_selftests.cpp
Diffstat (limited to 'tools/assistant')
| -rw-r--r-- | tools/assistant/lib/fulltextsearch/qclucene_global_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/assistant/lib/fulltextsearch/qclucene_global_p.h b/tools/assistant/lib/fulltextsearch/qclucene_global_p.h index 2a9d146..3dba45a 100644 --- a/tools/assistant/lib/fulltextsearch/qclucene_global_p.h +++ b/tools/assistant/lib/fulltextsearch/qclucene_global_p.h @@ -29,6 +29,14 @@ #include <QtCore/QChar> #include <QtCore/QString> +#if !defined(_MSC_VER) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T) +# if !defined(TCHAR) +# define TCHAR wchar_t +# endif +#else +# include <windows.h> +#endif + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -87,14 +95,6 @@ QT_BEGIN_NAMESPACE # define CL_NS2(sub,sub2) #endif -#if !defined(_MSC_VER) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T) -# if !defined(TCHAR) -# define TCHAR wchar_t -# endif -#else -# include <windows.h> -#endif - namespace { TCHAR* QStringToTChar(const QString &str) { |