Builds on windows again

This commit is contained in:
eelke 2017-11-26 13:07:21 +01:00
parent 33cf39b799
commit bebb3391c3
160 changed files with 138 additions and 117 deletions

47
core/core.pro Normal file
View file

@ -0,0 +1,47 @@
#-------------------------------------------------
#
# Project created by QtCreator 2017-02-26T10:51:14
#
#-------------------------------------------------
QT -= gui
TARGET = core
TEMPLATE = lib
CONFIG += staticlib c++14
INCLUDEPATH += C:\prog\include C:\VSproj\boost32\include\boost-1_65_1
DEFINES += WIN32_LEAN_AND_MEAN NOMINMAX
#LIBS += /LIBPATH:C:\VSproj\boost_1_63_0\stage\lib /LIBPATH:c:\prog\lib\ libpq.lib fmt.lib User32.lib ws2_32.lib
# The following define makes your compiler emit warnings if you use
# any feature of Qt which as been marked as deprecated (the exact warnings
# depend on your compiler). Please consult the documentation of the
# deprecated API in order to know how to port your code away from it.
DEFINES += QT_DEPRECATED_WARNINGS
# You can also make your code fail to compile if you use deprecated APIs.
# In order to do so, uncomment the following line.
# You can also select to disable deprecated APIs only up to a certain version of Qt.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
SOURCES += my_boost_assert_handler.cpp \
SqlLexer.cpp \
PasswordManager.cpp \
CsvWriter.cpp \
BackupFormatModel.cpp \
QueuedBackgroundTask.cpp
HEADERS += PasswordManager.h \
SqlLexer.h \
ScopeGuard.h \
CsvWriter.h \
BackupFormatModel.h \
QueuedBackgroundTask.h \
Expected.h
unix {
target.path = /usr/lib
INSTALLS += target
}

View file

@ -9,6 +9,10 @@
#include <QScrollBar> #include <QScrollBar>
#include <QStandardPaths> #include <QStandardPaths>
#ifdef WIN32
# include <windows.h> // for CreateProcess flags
#endif
BackupDialog::BackupDialog(QWidget *parent) : BackupDialog::BackupDialog(QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::BackupDialog) ui(new Ui::BackupDialog)

View file

@ -1,8 +1,8 @@
#include "CodeBuilderConfiguration.h" #include "CodeBuilderConfiguration.h"
#include "Pgsql_Result.h" #include "Pgsql_Result.h"
QString CodeBuilder::GenClassDefinition(const Pgsql::Result &result) const QString CodeBuilder::GenClassDefinition(const Pgsql::Result &result) const
{ {
return QString();
} }

Some files were not shown because too many files have changed in this diff Show more