Fixed MSVS 2012 build
This commit is contained in:
@@ -78,6 +78,9 @@ INCLUDEPATH += $$PWD/../addressbook
|
|||||||
INCLUDEPATH += $$PWD/../addressbook/data
|
INCLUDEPATH += $$PWD/../addressbook/data
|
||||||
DEPENDPATH += $$PWD/../addressbook
|
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/data
|
||||||
INCLUDEPATH += $$PWD/../countryregister
|
INCLUDEPATH += $$PWD/../countryregister
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,10 @@
|
|||||||
#include "campseller.h"
|
#include "campseller.h"
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
double round(double value) { return value < 0 ? -std::floor(0.5 - value) : std::floor(0.5 + value); }
|
||||||
|
#endif
|
||||||
|
|
||||||
CampService::CampService()
|
CampService::CampService()
|
||||||
{
|
{
|
||||||
m_pluginId = "CAMP";
|
m_pluginId = "CAMP";
|
||||||
|
|||||||
@@ -7,7 +7,8 @@ CampData::CampData(QObject *parent) : QObject(parent)
|
|||||||
m_totalPrice = 0;
|
m_totalPrice = 0;
|
||||||
m_sale = 0;
|
m_sale = 0;
|
||||||
m_totalSale = 0;
|
m_totalSale = 0;
|
||||||
m_ownerFirstame = false;
|
m_fixedSale = false;
|
||||||
|
m_fullPrice = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int CampData::id() const
|
int CampData::id() const
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
#ifndef IIMPORTPROGRESS_H
|
#ifndef IIMPORTPROGRESS_H
|
||||||
#define IIMPORTPROGRESS_H
|
#define IIMPORTPROGRESS_H
|
||||||
|
|
||||||
class IImportProgress
|
#include "core_global.h"
|
||||||
|
|
||||||
|
class CORESHARED_EXPORT IImportProgress
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
virtual void updateProgress(int currentPos) = 0;
|
virtual void updateProgress(int currentPos) = 0;
|
||||||
|
|||||||
+3
-1
@@ -5,11 +5,13 @@
|
|||||||
#include <QMetaObject>
|
#include <QMetaObject>
|
||||||
#include "iservice.h"
|
#include "iservice.h"
|
||||||
|
|
||||||
|
#include "core_global.h"
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
class ImportDialog;
|
class ImportDialog;
|
||||||
}
|
}
|
||||||
|
|
||||||
class ImportDialog : public QDialog
|
class CORESHARED_EXPORT ImportDialog : public QDialog
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
|
|||||||
@@ -4,11 +4,13 @@
|
|||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
#include "iimportprogress.h"
|
#include "iimportprogress.h"
|
||||||
|
|
||||||
|
#include "core_global.h"
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
class ImportProgress;
|
class ImportProgress;
|
||||||
}
|
}
|
||||||
|
|
||||||
class ImportProgress : public QWidget, public IImportProgress
|
class CORESHARED_EXPORT ImportProgress : public QWidget, public IImportProgress
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#include "countryregister.h"
|
#include "countryregister.h"
|
||||||
|
|
||||||
#include "countryregistergrid.h"
|
#include "countryregistergrid.h"
|
||||||
|
#include "countryregister-odb.hxx"
|
||||||
|
|
||||||
CountryRegister::CountryRegister()
|
CountryRegister::CountryRegister()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -7,8 +7,17 @@
|
|||||||
#include <QSharedPointer>
|
#include <QSharedPointer>
|
||||||
#include <data/comboitem.h>
|
#include <data/comboitem.h>
|
||||||
|
|
||||||
|
#include <QtCore/qglobal.h>
|
||||||
|
|
||||||
|
#if defined(COUNTRYREGISTER_LIBRARY)
|
||||||
|
# define COUNTRYREGISTERSHARED_EXPORT Q_DECL_EXPORT
|
||||||
|
#else
|
||||||
|
# define COUNTRYREGISTERSHARED_EXPORT Q_DECL_IMPORT
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#pragma db object
|
#pragma db object
|
||||||
class CountryData : public ComboItem
|
class COUNTRYREGISTERSHARED_EXPORT CountryData : public ComboItem
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY(QString code2 READ code2 WRITE setCode2)
|
Q_PROPERTY(QString code2 READ code2 WRITE setCode2)
|
||||||
|
|||||||
@@ -5,8 +5,16 @@
|
|||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <odb/core.hxx>
|
#include <odb/core.hxx>
|
||||||
|
|
||||||
|
#include <QtCore/qglobal.h>
|
||||||
|
|
||||||
|
#if defined(POSTREGISTER_LIBRARY)
|
||||||
|
# define POSTREGISTERSHARED_EXPORT Q_DECL_EXPORT
|
||||||
|
#else
|
||||||
|
# define POSTREGISTERSHARED_EXPORT Q_DECL_IMPORT
|
||||||
|
#endif
|
||||||
|
|
||||||
#pragma db object
|
#pragma db object
|
||||||
class PostData : public QObject
|
class POSTREGISTERSHARED_EXPORT PostData : public QObject
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY(QString townPart READ townPart WRITE setTownPart)
|
Q_PROPERTY(QString townPart READ townPart WRITE setTownPart)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#include "postregister.h"
|
#include "postregister.h"
|
||||||
|
|
||||||
#include "postregistergrid.h"
|
#include "postregistergrid.h"
|
||||||
|
#include "postregister-odb.hxx"
|
||||||
|
|
||||||
PostRegister::PostRegister()
|
PostRegister::PostRegister()
|
||||||
{
|
{
|
||||||
|
|||||||
+3
-4
@@ -6,10 +6,9 @@ SUBDIRS += \
|
|||||||
core \
|
core \
|
||||||
application \
|
application \
|
||||||
services \
|
services \
|
||||||
|
postregister \
|
||||||
|
countryregister \
|
||||||
addressbook \
|
addressbook \
|
||||||
shop \
|
shop \
|
||||||
commodity \
|
commodity \
|
||||||
camp \
|
camp
|
||||||
postregister \
|
|
||||||
countryregister
|
|
||||||
|
|
||||||
|
|||||||
@@ -10,8 +10,16 @@
|
|||||||
|
|
||||||
#include <enums.h>
|
#include <enums.h>
|
||||||
|
|
||||||
|
#include <QtCore/qglobal.h>
|
||||||
|
|
||||||
|
#if defined(SERVICES_LIBRARY)
|
||||||
|
# define SERVICESSHARED_EXPORT Q_DECL_EXPORT
|
||||||
|
#else
|
||||||
|
# define SERVICESSHARED_EXPORT Q_DECL_IMPORT
|
||||||
|
#endif
|
||||||
|
|
||||||
#pragma db object
|
#pragma db object
|
||||||
class AccService : public QObject
|
class SERVICESSHARED_EXPORT AccService : public QObject
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
|
|||||||
@@ -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:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../plugins/ -laddressbook
|
||||||
else:unix: 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/data
|
||||||
INCLUDEPATH += $$PWD/../addressbook
|
INCLUDEPATH += $$PWD/../addressbook
|
||||||
INCLUDEPATH += $$PWD/
|
INCLUDEPATH += $$PWD/
|
||||||
|
|||||||
Reference in New Issue
Block a user