From: Andrey Paskal <apaskal@gmail.com>
Date: Sun, 27 Dec 2009 18:00:57 +0000 (+0300)
Subject: Возвращаем линковку на место.
X-Git-Url: https://gitweb.ananas.su/?a=commitdiff_plain;h=7db1f003e477a2198b553812630d3a1e77f7c4f7;p=projects%2Fananas-labs-qt4.git

Возвращаем линковку на место.
---

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