diff --git a/qmake/fougdatax.pro b/qmake/fougdatax.pro index d79fdbb..8cd88ba 100644 --- a/qmake/fougdatax.pro +++ b/qmake/fougdatax.pro @@ -78,17 +78,17 @@ HAS_SUPPORT = $$find(DATAX, support) INSTALLS += support_inc } # !isEmpty(HAS_SUPPORT) -# qt4_support -contains(DATAX, qt4_support) { - HEADERS += ../src/support/qt4_stream.h - SOURCES += ../src/support/qt4_stream.cpp +# qt_support +contains(DATAX, qt_support) { + HEADERS += ../src/support/qt_stream.h + SOURCES += ../src/support/qt_stream.cpp QT = core - qt4_support_inc.path = $$PREFIX_DIR/include/datax/support - qt4_support_inc.files = ../src/support/qt4_stream.h - INSTALLS += qt4_support_inc -} # contains(DATAX, qt4_support) + qt_support_inc.path = $$PREFIX_DIR/include/datax/support + qt_support_inc.files = ../src/support/qt_stream.h + INSTALLS += qt_support_inc +} # contains(DATAX, qt_support) # occ_support contains(DATAX, occ_support) { @@ -131,3 +131,7 @@ contains(DATAX, occ_support) { #VER_MAJ = 0 #VER_MIN = 1 #VER_PAT = 0 + +OTHER_FILES += \ + ../doc/main_page.cpp \ + ../doc/Doxyfile diff --git a/src/support/qt_stream.cpp b/src/support/qt_stream.cpp index 8885085..ee9b9e6 100644 --- a/src/support/qt_stream.cpp +++ b/src/support/qt_stream.cpp @@ -1,4 +1,4 @@ -#include "qt4_stream.h" +#include "qt_stream.h" #include #include diff --git a/src/support/qt_stream.h b/src/support/qt_stream.h index 6b22f42..5f350ad 100644 --- a/src/support/qt_stream.h +++ b/src/support/qt_stream.h @@ -1,5 +1,5 @@ -#ifndef FOUG_SUPPORT_QT4_STREAM_H -#define FOUG_SUPPORT_QT4_STREAM_H +#ifndef FOUG_SUPPORT_QT_STREAM_H +#define FOUG_SUPPORT_QT_STREAM_H extern "C" { #include "support_global.h" @@ -10,4 +10,4 @@ class QIODevice; FOUG_LIBSUPPORT_EXPORT void foug_stream_set_qiodevice(foug_stream_t* stream, QIODevice* device); -#endif /* FOUG_SUPPORT_QT4_STREAM_H */ +#endif /* FOUG_SUPPORT_QT_STREAM_H */