diff --git a/camp/camp.pro b/camp/camp.pro index 8e2c548..af5b7ca 100644 --- a/camp/camp.pro +++ b/camp/camp.pro @@ -78,6 +78,9 @@ INCLUDEPATH += $$PWD/../addressbook INCLUDEPATH += $$PWD/../addressbook/data DEPENDPATH += $$PWD/../addressbook +win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../plugins/ -lcountryregister +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../plugins/ -lcountryregister + INCLUDEPATH += $$PWD/../countryregister/data INCLUDEPATH += $$PWD/../countryregister diff --git a/camp/campservice.cpp b/camp/campservice.cpp index 4aed30e..a751172 100644 --- a/camp/campservice.cpp +++ b/camp/campservice.cpp @@ -6,6 +6,10 @@ #include "campseller.h" #include +#ifdef _WIN32 +double round(double value) { return value < 0 ? -std::floor(0.5 - value) : std::floor(0.5 + value); } +#endif + CampService::CampService() { m_pluginId = "CAMP"; diff --git a/camp/data/campdata.cpp b/camp/data/campdata.cpp index fdaa25c..1e5029a 100644 --- a/camp/data/campdata.cpp +++ b/camp/data/campdata.cpp @@ -7,7 +7,8 @@ CampData::CampData(QObject *parent) : QObject(parent) m_totalPrice = 0; m_sale = 0; m_totalSale = 0; - m_ownerFirstame = false; + m_fixedSale = false; + m_fullPrice = 0; } int CampData::id() const diff --git a/core/iimportprogress.h b/core/iimportprogress.h index 49fc035..a6db2ff 100644 --- a/core/iimportprogress.h +++ b/core/iimportprogress.h @@ -1,7 +1,9 @@ #ifndef IIMPORTPROGRESS_H #define IIMPORTPROGRESS_H -class IImportProgress +#include "core_global.h" + +class CORESHARED_EXPORT IImportProgress { public: virtual void updateProgress(int currentPos) = 0; diff --git a/core/importdialog.h b/core/importdialog.h index 8fe18a1..58da75b 100644 --- a/core/importdialog.h +++ b/core/importdialog.h @@ -5,11 +5,13 @@ #include #include "iservice.h" +#include "core_global.h" + namespace Ui { class ImportDialog; } -class ImportDialog : public QDialog +class CORESHARED_EXPORT ImportDialog : public QDialog { Q_OBJECT diff --git a/core/importprogress.h b/core/importprogress.h index 81fd1bd..9b0de8a 100644 --- a/core/importprogress.h +++ b/core/importprogress.h @@ -4,11 +4,13 @@ #include #include "iimportprogress.h" +#include "core_global.h" + namespace Ui { class ImportProgress; } -class ImportProgress : public QWidget, public IImportProgress +class CORESHARED_EXPORT ImportProgress : public QWidget, public IImportProgress { Q_OBJECT diff --git a/countryregister/countryregister.cpp b/countryregister/countryregister.cpp index c910852..6656a4e 100644 --- a/countryregister/countryregister.cpp +++ b/countryregister/countryregister.cpp @@ -1,6 +1,7 @@ #include "countryregister.h" #include "countryregistergrid.h" +#include "countryregister-odb.hxx" CountryRegister::CountryRegister() { diff --git a/countryregister/data/countrydata.h b/countryregister/data/countrydata.h index 4caffb2..6e45125 100644 --- a/countryregister/data/countrydata.h +++ b/countryregister/data/countrydata.h @@ -7,8 +7,17 @@ #include #include +#include + +#if defined(COUNTRYREGISTER_LIBRARY) +# define COUNTRYREGISTERSHARED_EXPORT Q_DECL_EXPORT +#else +# define COUNTRYREGISTERSHARED_EXPORT Q_DECL_IMPORT +#endif + + #pragma db object -class CountryData : public ComboItem +class COUNTRYREGISTERSHARED_EXPORT CountryData : public ComboItem { Q_OBJECT Q_PROPERTY(QString code2 READ code2 WRITE setCode2) diff --git a/postregister/data/postdata.h b/postregister/data/postdata.h index c7cd2b7..cca7f53 100644 --- a/postregister/data/postdata.h +++ b/postregister/data/postdata.h @@ -5,8 +5,16 @@ #include #include +#include + +#if defined(POSTREGISTER_LIBRARY) +# define POSTREGISTERSHARED_EXPORT Q_DECL_EXPORT +#else +# define POSTREGISTERSHARED_EXPORT Q_DECL_IMPORT +#endif + #pragma db object -class PostData : public QObject +class POSTREGISTERSHARED_EXPORT PostData : public QObject { Q_OBJECT Q_PROPERTY(QString townPart READ townPart WRITE setTownPart) diff --git a/postregister/postregister.cpp b/postregister/postregister.cpp index 7824837..9e5cec6 100644 --- a/postregister/postregister.cpp +++ b/postregister/postregister.cpp @@ -1,6 +1,7 @@ #include "postregister.h" #include "postregistergrid.h" +#include "postregister-odb.hxx" PostRegister::PostRegister() { diff --git a/prodejna.pro b/prodejna.pro index a139d4f..a84833e 100644 --- a/prodejna.pro +++ b/prodejna.pro @@ -6,10 +6,9 @@ SUBDIRS += \ core \ application \ services \ + postregister \ + countryregister \ addressbook \ shop \ commodity \ - camp \ - postregister \ - countryregister - + camp diff --git a/services/data/accservice.h b/services/data/accservice.h index 9b10971..9abac86 100644 --- a/services/data/accservice.h +++ b/services/data/accservice.h @@ -10,8 +10,16 @@ #include +#include + +#if defined(SERVICES_LIBRARY) +# define SERVICESSHARED_EXPORT Q_DECL_EXPORT +#else +# define SERVICESSHARED_EXPORT Q_DECL_IMPORT +#endif + #pragma db object -class AccService : public QObject +class SERVICESSHARED_EXPORT AccService : public QObject { Q_OBJECT diff --git a/shop/shop.pro b/shop/shop.pro index 99f3424..c736271 100644 --- a/shop/shop.pro +++ b/shop/shop.pro @@ -86,6 +86,9 @@ win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../plugins/ -laddressb else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../plugins/ -laddressbook else:unix: LIBS += -L$$OUT_PWD/../plugins/ -laddressbook +win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../plugins/ -lcountryregister +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../plugins/ -lcountryregister + INCLUDEPATH += $$PWD/../addressbook/data INCLUDEPATH += $$PWD/../addressbook INCLUDEPATH += $$PWD/