баг с генерацией font_selection не под виндоус

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

DesktopEditor/Qt_build/editor/project/NativeControl.h

@@ -6,9 +6,9 @@
 #include <QWheelEvent>
 #include <QKeyEvent>
 #include <QPaintEvent>
-#include <QGLWidget>
+#include <QtOpenGL/QGLWidget>
 
-#define _USE_WEB_MENU_
+//#define _USE_WEB_MENU_
 
 #ifdef _USE_WEB_MENU_
 #include <QGraphicsView>

DesktopEditor/Qt_build/editor/project/native_control.pro

@@ -4,8 +4,10 @@
 #
 #-------------------------------------------------
 
-QT       -= core gui
-QT += widgets opengl
+QT       += core gui
+QT  += widgets opengl
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 TARGET = native_control
 TEMPLATE = lib

DesktopEditor/Qt_build/test/control/control.pro

@@ -15,12 +15,12 @@ DEFINES += \
     _QT
 
 CONFIG(debug, debug|release) {
-    LIBS += -L../../editor/Debug -lnative_control
-    LIBS += -L../../graphics/Debug -lgraphics
+    LIBS += -L../../editor/Debug/debug -lnative_control
+    LIBS += -L../../graphics/Debug/debug -lgraphics
     message(debug)
-} else {
-    LIBS += -L../../editor/Release -lnative_control
-    LIBS += -L../../graphics/Release -lgraphics
+} else {*/
+    LIBS += -L../../editor/Release/release -lnative_control
+    LIBS += -L../../graphics/Release/release -lgraphics
     message(release)
 }
 
@@ -81,11 +81,11 @@ win32 {
 }
 
 win32:contains(QMAKE_TARGET.arch, x86_64):{
-    LIBS += -L../../../../../../../../../v8/build/Release/lib -lv8_base.x64
-    LIBS += -L../../../../../../../../../v8/build/Release/lib -lv8_snapshot
-    LIBS += -L../../../../../../../../../v8/build/Release/lib -lv8_nosnapshot.x64
-    LIBS += -L../../../../../../../../../v8/build/Release/lib -licui18n
-    LIBS += -L../../../../../../../../../v8/build/Release/lib -licuuc
+    LIBS += -L../../../../SDK/lib/win_64 -lv8_base.x64
+    LIBS += -L../../../../SDK/lib/win_64 -lv8_snapshot
+    LIBS += -L../../../../SDK/lib/win_64 -lv8_nosnapshot.x64
+    LIBS += -L../../../../SDK/lib/win_64 -licui18n
+    LIBS += -L../../../../SDK/lib/win_64 -licuuc
 
     message(windows64)
 }

DesktopEditor/Qt_build/test_web/control/control.pro.user

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.1.2, 2014-07-24T17:13:45. -->
+<!-- Written by QtCreator 3.3.0, 2015-01-19T10:24:08. -->
 <qtcreator>
+ <data>
+  <variable>EnvironmentId</variable>
+  <value type="QByteArray">{7ff37b69-c7fb-4d07-b4ce-9ea25e9d04fc}</value>
+ </data>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
   <value type="int">0</value>
@@ -54,10 +58,10 @@
  <data>
   <variable>ProjectExplorer.Project.Target.0</variable>
   <valuemap type="QVariantMap">
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.3 MSVC2013 OpenGL 64bit</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.3 MSVC2013 OpenGL 64bit</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.53.win64_msvc2013_64_opengl_kit</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.4.0 MSVC2013 OpenGL 64bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.4.0 MSVC2013 OpenGL 64bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.54.win64_msvc2013_64_opengl_kit</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -72,6 +76,7 @@
       <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
       <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
      </valuemap>
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -125,6 +130,7 @@
       <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
       <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
      </valuemap>
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -218,14 +224,13 @@
     </valuelist>
     <value type="int" key="PE.EnvironmentAspect.Base">2</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">control</value>
+    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments"></value>
+    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value>
+    <value type="bool" key="ProjectExplorer.CustomExecutableRunConfiguration.UseTerminal">false</value>
+    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory">%{buildDir}</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Custom Executable</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents/DesktopEditor/Qt_build/test/control/control.pro</value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">control.pro</value>
-    <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
-    <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
@@ -241,11 +246,11 @@
   <value type="int">1</value>
  </data>
  <data>
-  <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
-  <value type="QByteArray">{7ff37b69-c7fb-4d07-b4ce-9ea25e9d04fc}</value>
+  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+  <value type="int">18</value>
  </data>
  <data>
-  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
-  <value type="int">15</value>
+  <variable>Version</variable>
+  <value type="int">18</value>
  </data>
 </qtcreator>

DesktopEditor/common/File.h

@@ -425,7 +425,7 @@ namespace NSFile
 		{
 			if (NULL == pData)
 			{
-				pData = new BYTE[2 * lCount + 3 + 1];
+            	pData = new BYTE[4 * lCount + 3 + 2];
 			}
 
 			BYTE* pCodesCur = pData;
@@ -468,6 +468,7 @@ namespace NSFile
 
 			lOutputCount = (LONG)(pCodesCur - pData);
 			*pCodesCur++ = 0;
+            *pCodesCur++ = 0;
 		}
 
 		static void GetUtf16StringFromUnicode_4bytes2(const wchar_t* pUnicodes, LONG lCount, CStringUtf16& data)