From 761fcad3b73aa9f6e0d0a29f309080c49092cb25 Mon Sep 17 00:00:00 2001 From: Pepa Rokos Date: Thu, 8 Jun 2017 22:11:25 +0200 Subject: [PATCH] Fixed MSVC2012 build --- core/reporting/reportviewer.h | 3 ++- shop/paydialog.cpp | 2 ++ shop/paydvouchersdialog.cpp | 2 ++ shop/shop.cpp | 2 +- shop/shopservice.h | 6 ++++-- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/core/reporting/reportviewer.h b/core/reporting/reportviewer.h index 376874e..d0f7f42 100644 --- a/core/reporting/reportviewer.h +++ b/core/reporting/reportviewer.h @@ -3,6 +3,7 @@ #include #include "report.h" +#include "core_global.h" namespace Ui { class ReportViewer; @@ -13,7 +14,7 @@ class PreviewReportWidget; class ReportEngine; } -class ReportViewer : public QDialog +class CORESHARED_EXPORT ReportViewer : public QDialog { Q_OBJECT diff --git a/shop/paydialog.cpp b/shop/paydialog.cpp index 7a90a9f..3995a46 100644 --- a/shop/paydialog.cpp +++ b/shop/paydialog.cpp @@ -2,6 +2,8 @@ #include "ui_paydialog.h" #include "shopservice.h" +#include "shop-odb.hxx" + PayDialog::PayDialog(QDecDouble total, QWidget *parent) : QDialog(parent), ui(new Ui::PayDialog) diff --git a/shop/paydvouchersdialog.cpp b/shop/paydvouchersdialog.cpp index 72a1e09..8a0407f 100644 --- a/shop/paydvouchersdialog.cpp +++ b/shop/paydvouchersdialog.cpp @@ -7,6 +7,8 @@ #include "shopservice.h" #include "eetbatchdialog.h" +#include "shop-odb.hxx" + PaydVouchersDialog::PaydVouchersDialog(QWidget *parent) : QDialog(parent), ui(new Ui::PaydVouchersDialog) diff --git a/shop/shop.cpp b/shop/shop.cpp index bc3bd85..7d6cf73 100644 --- a/shop/shop.cpp +++ b/shop/shop.cpp @@ -3,7 +3,7 @@ #include "shopform.h" #include "shopservice.h" #include "settings/shopsettingsform.h" - +#include "shop-odb.hxx" Shop::Shop() { diff --git a/shop/shopservice.h b/shop/shopservice.h index 7db60d8..6ecdc29 100644 --- a/shop/shopservice.h +++ b/shop/shopservice.h @@ -9,12 +9,14 @@ #include "data/shop-data.h" #include "shopitem.h" +#include "shop_global.h" + class PayDialog; class ShopForm; -void payVoucherFromUI(VoucherPtr voucher, PayDialog *dialog, ShopForm *form = NULL); +void SHOPSHARED_EXPORT payVoucherFromUI(VoucherPtr voucher, PayDialog *dialog, ShopForm *form = NULL); -class ShopService : public Service +class SHOPSHARED_EXPORT ShopService : public Service { public: ShopService();