Commits

Vincent Rabeux committed 7ab015e

Framework compiling on Windows with VS 9.

  • Participants
  • Parent commits 9b4743e

Comments (0)

Files changed (3)

File documentImageCreator/src/framework/CMakeLists.txt

 
 qt4_automoc(${DocumentCreator_sources})
 
-
-
+add_definitions(-DFRAMEWORK_LIB)
 
 ADD_LIBRARY(
         DocumentCreator SHARED

File documentImageCreator/src/framework/DocumentCreator/framework_global.h

 
 #include <QtCore/qglobal.h>
 
-#if defined(FRAMEWORK_LIB)
-#  define FRAMEWORK_EXPORT Q_DECL_EXPORT
+#ifdef Q_WS_WIN
+#   ifdef FRAMEWORK_LIB
+#           define FRAMEWORK_EXPORT Q_DECL_EXPORT
+#   else
+#           define FRAMEWORK_EXPORT Q_DECL_IMPORT
+#   endif
 #else
-#  define FRAMEWORK_EXPORT Q_DECL_IMPORT
+#   define FRAMEWORK_EXPORT
 #endif
 
+
 #endif // FRAMEWORK_GLOBAL_H

File documentImageCreator/src/framework/DocumentCreator/iomanager/parametricdocumentloader.cpp

     DocImageBlock * ParametricDocumentLoader::buildImageBlock ()
     {
         // do nothing for now
+		return NULL;
     }
 
     DocTextBlock * ParametricDocumentLoader::buildTextBlock ()
     }
 
 
-    DocParagraph * ParametricDocumentLoader::buildParagraph (){}
+    DocParagraph * ParametricDocumentLoader::buildParagraph (){ return NULL;}
     DocParagraph * ParametricDocumentLoader::buildParagraph (QStringList paragraph)
     {
         DocParagraph * p = new DocParagraph(_output);
         return p;
     }
 
-    DocString * ParametricDocumentLoader::buildString (){}
+    DocString * ParametricDocumentLoader::buildString (){return NULL;}
     DocString * ParametricDocumentLoader::buildString (QString str)
     {
         // TODO : default style
         return s;
     }
 
-    DocCharacter * ParametricDocumentLoader::buildCharacter (){}
+    DocCharacter * ParametricDocumentLoader::buildCharacter (){return NULL;}
     DocCharacter * ParametricDocumentLoader::buildCharacter (const QChar ch)
     {
         QAtomicInt id = 1;