From b730250bdd6cd6db4204ea14ba82f2a50e9dcda8 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 12 Mar 2014 14:18:42 +0100 Subject: Switch to new praxisdif. --- client/client.pro | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'client/client.pro') diff --git a/client/client.pro b/client/client.pro index 43f568f..f17faf0 100644 --- a/client/client.pro +++ b/client/client.pro @@ -5,7 +5,7 @@ CONFIG += debug TEMPLATE = app TARGET = pracro DEPENDPATH += . widgets -INCLUDEPATH += . widgets +INCLUDEPATH += . widgets ../praxisdif/qt RESOURCES += client.qrc QT += core gui network xml sql svg @@ -16,7 +16,8 @@ debug { DEFINES+=USE_DEBUG } -DEFINES+=VERSION=\\\"2.2.4\\\" +include(VERSION) +DEFINES+=VERSION=\\\"$$VERSION\\\" # For Qt5 contains(QT_VERSION, ^5.*) { @@ -46,7 +47,6 @@ HEADERS += \ launcherwindow.h \ lua.h \ luadb.h \ - ../server/src/luapraxisd.h \ luawidget.h \ macro.h \ macrowindow.h \ @@ -54,7 +54,6 @@ HEADERS += \ macrodrawer.h \ messagebox.h \ netcom.h \ - praxisd.h \ resumewidget.h \ template.h \ shortcuttooltip.h \ @@ -85,7 +84,9 @@ HEADERS += \ widgets/checkgroupbox.h \ widgets/window.h \ widgets/altcombobox.h \ - widgets/metawidget.h + widgets/metawidget.h \ + ../praxisdif/curl/luapraxisd.h \ + ../praxisdif/qt/praxisd.h SOURCES += \ pracro.cc \ @@ -95,7 +96,6 @@ SOURCES += \ launcherwindow.cc \ lua.cc \ luadb.cc \ - luapraxisd.cc \ luawidget.cc \ macro.cc \ macrowindow.cc \ @@ -103,7 +103,6 @@ SOURCES += \ macrodrawer.cc \ messagebox.cc \ netcom.cc \ - praxisd.cc \ resumewidget.cc \ template.cc \ shortcuttooltip.cc \ @@ -133,6 +132,9 @@ SOURCES += \ widgets/checkgroupbox.cc \ widgets/window.cc \ widgets/altcombobox.cc \ - widgets/metawidget.cc + widgets/metawidget.cc \ + ../praxisdif/qt/luapraxisd.cc \ + ../praxisdif/qt/praxisd.cc + TRANSLATIONS = pracro_dk.ts -- cgit v1.2.3