Merge branch 'master' of ssh://gitlab.com:/eelke/pgLab

# Conflicts:
#	common.pri
This commit is contained in:
eelke 2019-03-27 18:24:27 +01:00
commit 4694b09ba1
9 changed files with 31 additions and 28 deletions

View file

@ -4,7 +4,6 @@
#
#-------------------------------------------------
CONFIG += c++17
QT += core gui concurrent
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets sql
@ -17,11 +16,7 @@ TEMPLATE = app
error( "Couldn't find the common.pri file!" )
}
INCLUDEPATH += C:\Prog\include\pgsql
DEFINES += _WIN32_WINNT=0x0501
#LIBS += -LC:/prog/boost/lib -Lc:/prog/lib libpq.lib fmt.lib User32.lib ws2_32.lib
#LIBS += -LC:\VSproj\boost32\lib -LC:/PROG/LIB -lws2_32 -llibpq
win32:RC_ICONS += pglab.ico