ToastFreeware
/
toast
/
confclerk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6ae1026
)
fixed: broken compilation for linux caused by previous commit
author
pavelpa
<pavelpa@localhost>
Mon, 18 Jan 2010 12:38:10 +0000
(12:38 +0000)
committer
pavelpa
<pavelpa@localhost>
Mon, 18 Jan 2010 12:38:10 +0000
(12:38 +0000)
src/gui/gui.pro
patch
|
blob
|
history
diff --git
a/src/gui/gui.pro
b/src/gui/gui.pro
index 8d62f28436b6d315ea0de83ec3ddfb66bbe223f0..7aaf78e287ee0836d7a923a15fb4a5a11b51bbd1 100644
(file)
--- a/
src/gui/gui.pro
+++ b/
src/gui/gui.pro
@@
-1,3
+1,4
@@
+include(global.pri)
TEMPLATE = lib
TARGET = gui
DESTDIR = ../bin
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
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.
# 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 \
FORMS += mainwindow.ui \
daynavigatorwidget.ui \
- about.ui \
- alarmdialog.ui
+ about.ui
HEADERS += mainwindow.h \
HEADERS += mainwindow.h \
- daynavigatorwidget.h \
- alarmdialog.h
+ daynavigatorwidget.h
SOURCES += mainwindow.cpp \
SOURCES += mainwindow.cpp \
- daynavigatorwidget.cpp \
- alarmdialog.cpp
+ daynavigatorwidget.cpp
+
+maemo {
+ FORMS += alarmdialog.ui
+ HEADERS += alarmdialog.h
+ SOURCES += alarmdialog.cpp
+}