meson is now working ... somehow
This commit is contained in:
parent
2faa2fa019
commit
d13f9d2824
8 changed files with 43 additions and 11 deletions
|
@ -1,7 +1,7 @@
|
|||
#include "mainwindow.h"
|
||||
|
||||
#include "basketmodel.h"
|
||||
#include "config.h"
|
||||
#include <config.h>
|
||||
#include "pricedialog.h"
|
||||
#include "reportdialog.h"
|
||||
#include "salemodel.h"
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
qt5 = import('qt5')
|
||||
qt5_dep = dependency('qt5', modules: ['Core', 'Gui', 'PrintSupport'])
|
||||
qt5_dep = dependency('qt5', modules: ['Core', 'Gui', 'PrintSupport', 'Network'])
|
||||
|
||||
thread_dep = dependency('threads')
|
||||
|
||||
|
||||
src = ['kima2.cpp', 'mainwindow.cpp', 'sellerdialog.cpp', 'sellermodel.cpp',
|
||||
'pricedialog.cpp', 'basketmodel.cpp', 'salemodel.cpp', 'reportdialog.cpp',
|
||||
|
@ -7,9 +10,12 @@ src = ['kima2.cpp', 'mainwindow.cpp', 'sellerdialog.cpp', 'sellermodel.cpp',
|
|||
|
||||
ui = ['mainwindow.ui', 'sellerdialog.ui', 'pricedialog.ui', 'reportdialog.ui', 'settingsdialog.ui']
|
||||
|
||||
processed = qt5.preprocess(moc_headers : ['basketmodel.h', 'mainwindow.h', 'pricedialog.h', 'reportdialog.h', 'sellerdialog.h', 'settingsdialog.h'],
|
||||
processed = qt5.preprocess(moc_headers : ['basketmodel.h', 'mainwindow.h', 'pricedialog.h',
|
||||
'reportdialog.h', 'sellerdialog.h', 'settingsdialog.h',
|
||||
'sellermodel.h', 'salemodel.h'],
|
||||
ui_files : ui,
|
||||
qresources : '../../kima2.qrc',
|
||||
dependencies: qt5_dep)
|
||||
|
||||
kima2 = executable('kima2', sources : [src, processed], dependencies : qt5_dep)
|
||||
kima2 = executable('kima2', sources : [src, processed], dependencies : [qt5_dep, singleapp_dep, core_dep, printer_dep, thread_dep],
|
||||
include_directories : [configuration_inc])
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
|
||||
class SettingsDialog : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
SettingsDialog(QWidget* parent = nullptr,
|
||||
Qt::WindowFlags f = Qt::WindowTitleHint | Qt::WindowSystemMenuHint);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue