mac commit1

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

DesktopEditor/Qt_build/editor/project/NativeControl.cpp

@@ -4,7 +4,9 @@
 #include <QGLContext>
 #include <QThread>
 
+#ifdef _QTX
 #include "GL/glx.h"
+#endif
 
 class CEditorCtrlWrapper : public CEditorCtrl
 {
@@ -286,9 +288,11 @@ void CNativeCtrl::paintGL()
 
     DWORD dwTime2 = NSTimers::GetTickCount();
 
+    /*
     FILE* file = fopen("/home/oleg/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents/DesktopEditor/log.txt", "a+");
     fprintf(file, "time: %d\n", (int)(dwTime2 - dwTime1));
     fclose(file);
+    */
 }
 
 void CNativeCtrl::resizeGL(int width, int height)

DesktopEditor/Qt_build/editor/project/native_control.pro

@@ -21,6 +21,8 @@ linux-g++ | linux-g++-64 | linux-g++-32 {
 
 mac {
     DEFINES += \
+    _LINUX \
+    _LINUX_QT \
     _MAC \
     QT_MAC
 }