From bcbbac833b6b24de454fb18151c2115f5e284201 Mon Sep 17 00:00:00 2001 From: Shane King Date: Fri, 14 Dec 2007 01:02:43 +0000 Subject: Move the wchar_t msvc fix local to phonon, including it for everything linked against qt causes link problems with other libraries. svn path=/trunk/KDE/kdelibs/; revision=748277 --- modules/FindQt4.cmake | 7 ------- 1 file changed, 7 deletions(-) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index cd533dce..608f3e86 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -197,13 +197,6 @@ QT_CHECK_FLAG_EXISTS(-DQT_NO_DEBUG CMAKE_CXX_FLAGS_RELWITHDEBINFO "Release with QT_CHECK_FLAG_EXISTS(-DQT_NO_DEBUG CMAKE_CXX_FLAGS_RELEASE "release") QT_CHECK_FLAG_EXISTS(-DQT_NO_DEBUG CMAKE_CXX_FLAGS_MINSIZEREL "release minsize") -if (MSVC80) - # need to set this option for MSVC 2005+ or else - # QString::fromWCharArray will result in an unresolved external - # see http://www.qtcentre.org/forum/f-installation-5/t-wchar-to-qstring-giving-error-in-vs2005-4625.html - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:wchar_t-") -endif (MSVC80) - INCLUDE(CheckSymbolExists) INCLUDE(MacroAddFileDependencies) INCLUDE(MacroPushRequiredVars) -- cgit v1.2.1