Fixed MSVS 2012 build

master
Pepa Rokos 8 years ago
parent 27ec7282eb
commit b916d626d1

@ -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

@ -6,6 +6,10 @@
#include "campseller.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()
{
m_pluginId = "CAMP";

@ -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

@ -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;

@ -5,11 +5,13 @@
#include <QMetaObject>
#include "iservice.h"
#include "core_global.h"
namespace Ui {
class ImportDialog;
}
class ImportDialog : public QDialog
class CORESHARED_EXPORT ImportDialog : public QDialog
{
Q_OBJECT

@ -4,11 +4,13 @@
#include <QWidget>
#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

@ -1,6 +1,7 @@
#include "countryregister.h"
#include "countryregistergrid.h"
#include "countryregister-odb.hxx"
CountryRegister::CountryRegister()
{

@ -7,8 +7,17 @@
#include <QSharedPointer>
#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
class CountryData : public ComboItem
class COUNTRYREGISTERSHARED_EXPORT CountryData : public ComboItem
{
Q_OBJECT
Q_PROPERTY(QString code2 READ code2 WRITE setCode2)

@ -5,8 +5,16 @@
#include <QObject>
#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
class PostData : public QObject
class POSTREGISTERSHARED_EXPORT PostData : public QObject
{
Q_OBJECT
Q_PROPERTY(QString townPart READ townPart WRITE setTownPart)

@ -1,6 +1,7 @@
#include "postregister.h"
#include "postregistergrid.h"
#include "postregister-odb.hxx"
PostRegister::PostRegister()
{

@ -6,10 +6,9 @@ SUBDIRS += \
core \
application \
services \
postregister \
countryregister \
addressbook \
shop \
commodity \
camp \
postregister \
countryregister
camp

@ -10,8 +10,16 @@
#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
class AccService : public QObject
class SERVICESSHARED_EXPORT AccService : public QObject
{
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: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/

Loading…
Cancel
Save