crossplatform qt build

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

.gitattributes

@@ -377,6 +377,19 @@ Common/DocxFormat/Source/XML/libxml2/XML/test/utf16lebom.xml svn_mime_002dtype=a
 Common/DocxFormat/Source/XML/libxml2/XML/test/valid/dtds/utf16b.ent svn_mime_002dtype=application%2Foctet-stream
 Common/DocxFormat/Source/XML/libxml2/XML/test/valid/dtds/utf16l.ent svn_mime_002dtype=application%2Foctet-stream
 Common/DocxFormat/Source/XML/libxml2/XML/win32/wince/libxml2.vco svn_mime_002dtype=application%2Foctet-stream
+DesktopEditor/Qt_build svnc_tsvn_003alogminsize=5
+DesktopEditor/Qt_build/editor svnc_tsvn_003alogminsize=5
+DesktopEditor/Qt_build/editor/Debug svnc_tsvn_003alogminsize=5
+DesktopEditor/Qt_build/editor/Release svnc_tsvn_003alogminsize=5
+DesktopEditor/Qt_build/editor/project svnc_tsvn_003alogminsize=5
+DesktopEditor/Qt_build/graphics svnc_tsvn_003alogminsize=5
+DesktopEditor/Qt_build/graphics/Debug svnc_tsvn_003alogminsize=5
+DesktopEditor/Qt_build/graphics/Release svnc_tsvn_003alogminsize=5
+DesktopEditor/Qt_build/graphics/project svnc_tsvn_003alogminsize=5
+DesktopEditor/Qt_build/test svnc_tsvn_003alogminsize=5
+DesktopEditor/Qt_build/test/Debug svnc_tsvn_003alogminsize=5
+DesktopEditor/Qt_build/test/Release svnc_tsvn_003alogminsize=5
+DesktopEditor/Qt_build/test/control svnc_tsvn_003alogminsize=5
 DesktopEditor/Teamlab[!!-~]Editor[!!-~]IOS/Document[!!-~]Editor/Document[!!-~]Editor.xcodeproj/project.xcworkspace/xcuserdata/Korol.xcuserdatad/UserInterfaceState.xcuserstate svn_mime_002dtype=application%2Foctet-stream
 DesktopEditor/Teamlab[!!-~]Editor[!!-~]IOS/Document[!!-~]Editor/Document[!!-~]Editor.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate svn_mime_002dtype=application%2Foctet-stream
 DesktopEditor/Teamlab[!!-~]Editor[!!-~]IOS/Document[!!-~]Editor/ios_app_resources/media/image1.jpg svn_mime_002dtype=application%2Foctet-stream

DesktopEditor/Qt_build/editor/project/NativeControl.h

+#ifndef NATIVECONTROL_H
+#define NATIVECONTROL_H
+
+#include <QWidget>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QPaintEvent>
+#include <QGLWidget>
+
+class CEditorCtrlWrapper;
+class CNativeCtrl : public QGLWidget
+{
+    Q_OBJECT
+
+signals:
+    void signal_threadRepaint();
+
+protected slots:
+    void slot_threadRepaint();
+
+public:
+    CNativeCtrl(QWidget *parent = 0, const char *name = NULL);
+    virtual ~CNativeCtrl();
+public:
+
+    virtual void initializeGL();
+
+    virtual void paintGL();
+    virtual void resizeGL(int width, int height);
+
+    virtual void closeEvent(QCloseEvent* e);
+
+    virtual void mousePressEvent(QMouseEvent* e);
+    virtual void mouseMoveEvent(QMouseEvent* e);
+    virtual void mouseReleaseEvent(QMouseEvent* e);
+
+    virtual void keyPressEvent(QKeyEvent* e);
+    virtual void keyReleaseEvent(QKeyEvent* e);
+
+    virtual void InvalidateRectNative(int x, int y, int w, int h);
+
+private:
+    CEditorCtrlWrapper* m_pWrapper;
+};
+
+#endif // NATIVECONTROL_H

DesktopEditor/Qt_build/editor/project/native_control.pro

+#-------------------------------------------------
+#
+# Project created by QtCreator 2014-03-15T18:33:57
+#
+#-------------------------------------------------
+
+QT       -= core gui
+QT += widgets opengl
+
+TARGET = native_control
+TEMPLATE = lib
+CONFIG += staticlib
+DEFINES += \
+    _QT
+
+linux-g++ | linux-g++-64 | linux-g++-32 {
+    DEFINES += \
+    _LINUX \
+    _LINUX_QT
+}
+
+mac {
+    DEFINES += \
+    _MAC \
+    QT_MAC
+}
+
+win32 {
+    DEFINES += \
+    WIN32
+}
+
+INCLUDEPATH += \
+    ../../../agg-2.4/include \
+    ../../../freetype-2.5.2/include \
+    ../../../../../../../../../v8/include
+
+SOURCES += \
+    ../../../editor/v8_core/DrawingDocumentWrapper.cpp \
+    ../../../editor/v8_core/HitControl.cpp \
+    ../../../editor/v8_core/JSEngine2.cpp \
+    ../../../editor/v8_core/OverlayTracker.cpp \
+    ../../../editor/v8_core/PageDrawer.cpp \
+    ../../../editor/v8_core/TextMeasurer2.cpp \
+    ../../../editor/v8_core/v8_jscore.cpp \
+    ../../../editor/CacheDocument.cpp \
+    ../../../editor/Control.cpp \
+    ../../../editor/DibPainter.cpp \
+    ../../../editor/JSEngine.cpp \
+    ../../../editor/Overlay.cpp \
+    ../../../editor/Rulers.cpp \
+    ../../../editor/TextMeasurer.cpp \
+    ../../../editor/Viewer.cpp \
+    NativeControl.cpp
+
+
+HEADERS += \
+    ../../../editor/Buttons.h \
+    ../../../editor/CacheDocument.h \
+    ../../../editor/Control.h \
+    ../../../editor/Controllers.h \
+    ../../../editor/DibPainter.h \
+    ../../../editor/DrawingDocument.h \
+    ../../../editor/DrawingDocumentWrapper.h \
+    ../../../editor/HitControl.h \
+    ../../../editor/JSCore.h \
+    ../../../editor/JSEngine.h \
+    ../../../editor/MainControl.h \
+    ../../../editor/MemoryStream.h \
+    ../../../editor/Overlay.h \
+    ../../../editor/OverlayTracker.h \
+    ../../../editor/PageDrawer.h \
+    ../../../editor/Rulers.h \
+    ../../../editor/Scroll.h \
+    ../../../editor/TextMeasurer.h \
+    ../../../editor/v8_classes.h \
+    ../../../editor/VideoFrameBuffer.h \
+    ../../../editor/Viewer.h \
+    NativeControl.h
+
+unix {
+    target.path = /usr/lib
+    INSTALLS += target
+}
+
+OTHER_FILES +=

DesktopEditor/Qt_build/test/control/NativeControl.h

+#ifndef TEST_NATIVECONTROL_H
+#define TEST_NATIVECONTROL_H
+
+#include "../../editor/project/NativeControl.h"
+typedef CNativeCtrl NativeControl;
+
+#endif // TEST_NATIVECONTROL_H

DesktopEditor/Qt_build/test/control/control.pro

+#-------------------------------------------------
+#
+# Project created by QtCreator 2014-03-22T17:09:03
+#
+#-------------------------------------------------
+
+QT       += core gui opengl
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = control
+TEMPLATE = app
+
+DEFINES += \
+    LINUX \
+    _LINUX \
+    _LINUX_QT \
+    _QT \
+    _QTX
+
+INCLUDEPATH += \
+    ../../../agg-2.4/include \
+    ../../../freetype-2.5.2/include \
+    ../../../../../../../../../v8/include
+
+CONFIG(debug, debug|release) {
+LIBS += -lX11
+LIBS += -L../../editor/Debug -lnative_control
+LIBS += -L../../graphics/Debug -lgraphics
+LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_base.ia32
+LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_snapshot
+LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_nosnapshot.ia32
+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(debug)
+} else {
+LIBS += -L../../editor/Release -lnative_control
+LIBS += -L../../graphics/Release -lgraphics
+LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_base.ia32
+LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_snapshot
+LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_nosnapshot.ia32
+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(release)
+}
+
+SOURCES += main.cpp\
+        mainwindow.cpp
+
+HEADERS  += mainwindow.h \
+    NativeControl.h
+
+FORMS    += mainwindow.ui

DesktopEditor/Qt_build/test/control/main.cpp

+#include "mainwindow.h"
+#include <QApplication>
+#include "GL/glx.h"
+
+int main(int argc, char *argv[])
+{
+    /*
+    int err = XInitThreads();
+    QApplication::setAttribute( Qt::AA_X11InitThreads );
+    */
+
+    QApplication a(argc, argv);
+    MainWindow w;
+    w.show();
+
+    return a.exec();
+}

DesktopEditor/Qt_build/test/control/mainwindow.cpp

+#include "mainwindow.h"
+#include "ui_mainwindow.h"
+
+MainWindow::MainWindow(QWidget *parent) :
+    QMainWindow(parent),
+    ui(new Ui::MainWindow)
+{
+    ui->setupUi(this);
+}
+
+MainWindow::~MainWindow()
+{
+    delete ui;
+}
+
+void MainWindow::resizeEvent(QResizeEvent* e)
+{
+    ui->widget->setGeometry(10, 10, this->width() - 20, this->height() - 60);
+}
+
+void MainWindow::closeEvent(QCloseEvent* e)
+{
+    ui->widget->closeEvent(e);
+}

DesktopEditor/Qt_build/test/control/mainwindow.h

+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+
+namespace Ui {
+class MainWindow;
+}
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    explicit MainWindow(QWidget *parent = 0);
+    ~MainWindow();
+
+private:
+    Ui::MainWindow *ui;
+
+protected:
+    virtual void resizeEvent(QResizeEvent* e);
+    virtual void closeEvent(QCloseEvent* e);
+};
+
+#endif // MAINWINDOW_H

DesktopEditor/Qt_build/test/control/mainwindow.ui

+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>564</width>
+    <height>361</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralWidget">
+   <widget class="NativeControl" name="widget" native="true">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>10</y>
+      <width>541</width>
+      <height>281</height>
+     </rect>
+    </property>
+   </widget>
+  </widget>
+  <widget class="QMenuBar" name="menuBar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>564</width>
+     <height>20</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QToolBar" name="mainToolBar">
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+  </widget>
+  <widget class="QStatusBar" name="statusBar"/>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <customwidgets>
+  <customwidget>
+   <class>NativeControl</class>
+   <extends>QWidget</extends>
+   <header location="global">NativeControl.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>