native_control qt_build windows

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@57266 954022d7-b5bf-4e40-9824-e11837661b57

DesktopEditor/Qt_build/test/control/control.pro

@@ -36,6 +36,8 @@ linux-g++ | linux-g++-64 | linux-g++-32 {
     LIBS += -L../../../../../../../../../v8/out/native/obj.target/third_party/icu -licui18n
     LIBS += -L../../../../../../../../../v8/out/native/obj.target/third_party/icu -licuuc
     LIBS += -L../../../../../../../../../v8/out/native/obj.target/third_party/icu -licudata
+
+    message(linux)
 }
 
 mac {
@@ -52,11 +54,17 @@ mac {
     LIBS += -L../../../../../../../../../v8/out/native -licui18n
     LIBS += -L../../../../../../../../../v8/out/native -licuuc
     LIBS += -L../../../../../../../../../v8/out/native -licudata
+
+    message(mac)
 }
 
 win32 {
     DEFINES += \
     WIN32
+
+    DEFINES -= UNICODE
+
+    message(windows)
 }
 
 INCLUDEPATH += \

DesktopEditor/graphics/Timer.h

@@ -9,6 +9,10 @@
 #include "mach/mach_time.h"
 #endif
 
+#ifdef WIN32
+//#define _CAN_USE_COM_THREADS
+#endif
+
 namespace NSTimers
 {
 #ifdef _MAC
@@ -67,7 +71,7 @@ namespace NSTimers
 	protected:
 		virtual DWORD ThreadProc()
 		{
-#if defined(WIN32) || defined(_WIN32_WCE)
+#ifdef _CAN_USE_COM_THREADS
 			if (m_bIsCOMNeed)
 				CoInitialize(NULL);
 #endif
@@ -89,7 +93,7 @@ namespace NSTimers
 				OnTimer();				
 			}
 
-#if defined(WIN32) || defined(_WIN32_WCE)
+#ifdef _CAN_USE_COM_THREADS
 			if (m_bIsCOMNeed)
 				CoUninitialize();
 #endif