From 068656de058f2006bf78fed1317cb6084fa2fc1c Mon Sep 17 00:00:00 2001 From: pavelpa Date: Mon, 18 Jan 2010 12:38:10 +0000 Subject: [PATCH] fixed: broken compilation for linux caused by previous commit --- src/gui/gui.pro | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 8d62f28..7aaf78e 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -1,3 +1,4 @@ +include(global.pri) TEMPLATE = lib TARGET = gui DESTDIR = ../bin @@ -9,6 +10,12 @@ LIBS += -L$$DESTDIR -lmvc -lorm -lsql -lqalarm INCLUDEPATH += ../orm ../mvc ../sql ../alarm DEPENDPATH += . ../orm ../mvc ../sql ../alarm TARGETDEPS += $$DESTDIR/liborm.a $$DESTDIR/libmvc.a $$DESTDIR/libsql.a $$DESTDIR/libqalarm.a +maemo { + LIBS += -L$$DESTDIR -lqalarm + INCLUDEPATH += ../alarm + DEPENDPATH += ../alarm + TARGETDEPS += $$DESTDIR/libqalarm.a +} # A shamelessly long list of sources, headers and forms. @@ -18,14 +25,17 @@ TARGETDEPS += $$DESTDIR/liborm.a $$DESTDIR/libmvc.a $$DESTDIR/libsql.a $$DESTDIR FORMS += mainwindow.ui \ daynavigatorwidget.ui \ - about.ui \ - alarmdialog.ui + about.ui HEADERS += mainwindow.h \ - daynavigatorwidget.h \ - alarmdialog.h + daynavigatorwidget.h SOURCES += mainwindow.cpp \ - daynavigatorwidget.cpp \ - alarmdialog.cpp + daynavigatorwidget.cpp + +maemo { + FORMS += alarmdialog.ui + HEADERS += alarmdialog.h + SOURCES += alarmdialog.cpp +} -- 2.30.2