no export graphics

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

no export graphics
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@64012 954022d7-b5bf-4e40-9824-e11837661b57
92333c20 · Oleg.Korshul · Alexander Trofimov · 3d4b0ed6 · 92333c20 · 92333c20
Commit 92333c20 authored Aug 11, 2015 by Oleg.Korshul Committed by Alexander Trofimov May 21, 2016
6 changed files
--- a/DesktopEditor/graphics/GraphicsPath.cpp
+++ b/DesktopEditor/graphics/GraphicsPath.cpp
 #include "GraphicsPath.h"
+#include <algorithm>

 namespace Aggplus
 {

--- a/DjVuFile/DjVuFile.pro
+++ b/DjVuFile/DjVuFile.pro
@@ -46,9 +46,12 @@ shared {
    DEFINES += DJVU_USE_DYNAMIC_LIBRARY

    LIBS += -L$$DESTDIR -lASCOfficeUtilsLib
-    LIBS += -L$$DESTDIR -lgraphics
    LIBS += -L$$DESTDIR -lPdfWriter

+    #LIBS += -L$$DESTDIR -lgraphics
+    LIB_GRAPHICS_PRI_PATH = ../DesktopEditor
+    include(../DesktopEditor/Qt_build/graphics/project/graphics.pri)
+
    LIB_XML_PRI_PATH = ../DesktopEditor/xml
    include(../DesktopEditor/xml/build/qt/libxml2.pri)


--- a/HtmlRenderer/htmlrenderer.pro
+++ b/HtmlRenderer/htmlrenderer.pro
@@ -49,7 +49,10 @@ shared {
    DEFINES += HTMLRENDERER_USE_DYNAMIC_LIBRARY

    LIBS += -L$$DESTDIR -lASCOfficeUtilsLib
-    LIBS += -L$$DESTDIR -lgraphics
+
+    #LIBS += -L$$DESTDIR -lgraphics
+    LIB_GRAPHICS_PRI_PATH = ../DesktopEditor
+    include(../DesktopEditor/Qt_build/graphics/project/graphics.pri)

    LIB_XML_PRI_PATH = ../DesktopEditor/xml
    include(../DesktopEditor/xml/build/qt/libxml2.pri)

--- a/PdfReader/PdfReader.pro
+++ b/PdfReader/PdfReader.pro
@@ -49,7 +49,10 @@ shared {
    DEFINES += PDFREADER_USE_DYNAMIC_LIBRARY

    LIBS += -L$$DESTDIR -lASCOfficeUtilsLib
-    LIBS += -L$$DESTDIR -lgraphics
+
+    #LIBS += -L$$DESTDIR -lgraphics
+    LIB_GRAPHICS_PRI_PATH = ../DesktopEditor
+    include(../DesktopEditor/Qt_build/graphics/project/graphics.pri)

    #include(../DesktopEditor/xml/build/qt/libxml2.pri)


--- a/PdfWriter/PdfWriter.pro
+++ b/PdfWriter/PdfWriter.pro
@@ -46,7 +46,10 @@ shared {
    DEFINES += PDFWRITER_USE_DYNAMIC_LIBRARY

    LIBS += -L$$DESTDIR -lASCOfficeUtilsLib
-    LIBS += -L$$DESTDIR -lgraphics
+
+    #LIBS += -L$$DESTDIR -lgraphics
+    LIB_GRAPHICS_PRI_PATH = ../DesktopEditor
+    include(../DesktopEditor/Qt_build/graphics/project/graphics.pri)

    message(dynamic)


--- a/XpsFile/XpsFile.pro
+++ b/XpsFile/XpsFile.pro
@@ -46,9 +46,12 @@ shared {
    DEFINES += XPS_USE_DYNAMIC_LIBRARY

    LIBS += -L$$DESTDIR -lASCOfficeUtilsLib
-    LIBS += -L$$DESTDIR -lgraphics
    LIBS += -L$$DESTDIR -lPdfWriter

+    #LIBS += -L$$DESTDIR -lgraphics
+    LIB_GRAPHICS_PRI_PATH = ../DesktopEditor
+    include(../DesktopEditor/Qt_build/graphics/project/graphics.pri)
+
    LIB_XML_PRI_PATH = ../DesktopEditor/xml
    include(../DesktopEditor/xml/build/qt/libxml2.pri)