From 7db1f003e477a2198b553812630d3a1e77f7c4f7 Mon Sep 17 00:00:00 2001 From: Andrey Paskal Date: Sun, 27 Dec 2009 21:00:57 +0300 Subject: [PATCH] =?utf8?q?=D0=92=D0=BE=D0=B7=D0=B2=D1=80=D0=B0=D1=89=D0=B0=D0=B5=D0=BC=20=D0=BB=D0=B8=D0=BD=D0=BA=D0=BE=D0=B2=D0=BA=D1=83=20=D0=BD=D0=B0=20=D0=BC=D0=B5=D1=81=D1=82=D0=BE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/admin/admin.pro | 3 +-- src/ananas/ananas.pro | 4 ++-- src/designer/designer.pro | 4 ++-- src/lib/lib.pro | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/admin/admin.pro b/src/admin/admin.pro index 897d7a0..dd15806 100644 --- a/src/admin/admin.pro +++ b/src/admin/admin.pro @@ -12,8 +12,7 @@ LANGUAGE = C++ DESTDIR = ../../bin LIBS += -L../../lib -lananas4 -LIBS += -L../../lib/designer -lananasplugin4 -L$(QTDIR)/lib -#LIBS += -L../../lib/designer -lananasplugin4 -lqt4-qdataschema -L$(QTDIR)/lib +LIBS += -L../../lib/designer -lananasplugin4 -lqt4-qdataschema -L$(QTDIR)/lib INCLUDEPATH += ../lib ../lib/tmp/ui ../lib/.ui diff --git a/src/ananas/ananas.pro b/src/ananas/ananas.pro index 3cf293e..b8acc6b 100644 --- a/src/ananas/ananas.pro +++ b/src/ananas/ananas.pro @@ -12,8 +12,8 @@ TEMPLATE = app DESTDIR = ../../bin INCLUDEPATH += ../lib ../../tmp/ui/ananas ../plugins -LIBS += -L../../lib -lananas4 -L../../lib/designer -lananasplugin4 -#LIBS += -L../../lib -lananas4 -L../../lib/designer -lananasplugin4 -lqt4-qdataschema +#LIBS += -L../../lib -lananas4 -L../../lib/designer -lananasplugin4 +LIBS += -L../../lib -lananas4 -L../../lib/designer -lananasplugin4 -lqt4-qdataschema HEADERS = \ mainform.h diff --git a/src/designer/designer.pro b/src/designer/designer.pro index ef86f4a..b391724 100644 --- a/src/designer/designer.pro +++ b/src/designer/designer.pro @@ -8,8 +8,8 @@ CONFIG += designer DESTDIR = ../../bin INCLUDEPATH += . ./formdesigner ./formdesigner/private ../lib ../../tmp/ui/ananas ../plugins ../editor -LIBS += -L../../lib -lananas4 -lqt4designer -L../../lib/designer -lananasplugin4 -L../editor -lqtscriptedit -#LIBS += -L../../lib -lananas4 -lqt4designer -L../../lib/designer -lananasplugin4 -lqt4-qdataschema -L../editor -lqtscriptedit +#LIBS += -L../../lib -lananas4 -lqt4designer -L../../lib/designer -lananasplugin4 -L../editor -lqtscriptedit +LIBS += -L../../lib -lananas4 -lqt4designer -L../../lib/designer -lananasplugin4 -lqt4-qdataschema -L../editor -lqtscriptedit unix { #LIBS += -L$(QTINC)/QtDesigner LIBS += -lQtDesignerComponents diff --git a/src/lib/lib.pro b/src/lib/lib.pro index 1187da9..57a1de9 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -15,7 +15,7 @@ DLLDESTDIR = ../../bin INCLUDEPATH += ../lib ../plugins LIBS += -L../../lib -#LIBS +=-lqt4-dataschema +LIBS +=-lqt4-dataschema shared { win32:DEFINES += ANANAS_DLL -- 1.7.1