Renamed dependency from libqt4-qdataschema to libqdataschema

diff --git a/build/ubuntu/control b/build/ubuntu/control
index 8954000..083a75b 100644 (file)
--- a/build/ubuntu/control
+++ b/build/ubuntu/control
@@ -2,12 +2,12 @@ Source: ananas
 Section: utils
 Priority: optional
 Maintainer: Andrey Paskal (app) <apaskal@gmail.com>
-Build-Depends: debhelper (>= 5), qt4-dev-tools, libqt4-dev, libmysqlclient-dev, libqt4-qdataschema, qt4-qmake, libqtassistantclient-dev
+Build-Depends: debhelper (>= 5), qt4-dev-tools, libqt4-dev, libmysqlclient-dev, libqdataschema, qt4-qmake, libqtassistantclient-dev
 Standards-Version: 3.7.2
 
 Package: ananas
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, zip, unzip, libqtgui4, mysql-client (>=4.1), mysql-server (>=4.1), libqt4-scripttools, libqt4-qdataschema
+Depends: ${shlibs:Depends}, ${misc:Depends}, zip, unzip, libqtgui4, mysql-client (>=4.1), mysql-server (>=4.1), libqt4-scripttools, libqdataschema
 Description: Runtime and development environment of Finance Applications
 Description-ru:  Среда разработки и исполнения прикладных решений автоматизации оперативного, бухгалтерского и других видов учета.
  Учет товаров и рассчетов на компьютере.

diff --git a/src/admin/admin.pro b/src/admin/admin.pro
index f33daaa..3840315 100644 (file)
--- a/src/admin/admin.pro
+++ b/src/admin/admin.pro
@@ -12,7 +12,7 @@ LANGUAGE      = C++
 DESTDIR = ../../bin
 
 LIBS   += -L../../lib -lananas 
-LIBS    += -L../../lib/designer -lananasplugin -lqt4-qdataschema -L$(QTDIR)/lib
+LIBS    += -L../../lib/designer -lananasplugin -lqdataschema -L$(QTDIR)/lib
 
 INCLUDEPATH    += ../lib ../lib/tmp/ui ../lib/.ui
 

diff --git a/src/ananas/ananas.pro b/src/ananas/ananas.pro
index 1f60af7..c682e4d 100644 (file)
--- a/src/ananas/ananas.pro
+++ b/src/ananas/ananas.pro
@@ -13,7 +13,7 @@ DESTDIR = ../../bin
 
 INCLUDEPATH += ../lib ../../tmp/ui/ananas ../plugins
 #LIBS += -L../../lib -lananas -L../../lib/designer -lananasplugin 
-LIBS += -L../../lib -lananas -L../../lib/designer -lananasplugin -lqt4-qdataschema 
+LIBS += -L../../lib -lananas -L../../lib/designer -lananasplugin -lqdataschema 
 
 HEADERS = \
     mainform.h

diff --git a/src/designer/designer.pro b/src/designer/designer.pro
index 1fc1cbe..dca0499 100644 (file)
--- a/src/designer/designer.pro
+++ b/src/designer/designer.pro
@@ -8,7 +8,7 @@ CONFIG += designer
 DESTDIR = ../../bin
 
 INCLUDEPATH += . ./formdesigner ./formdesigner/private  ../lib ../../tmp/ui/ananas ../plugins ../editor
-LIBS += -L../../lib -lananas -lqt4designer -L../../lib/designer -lananasplugin -lqt4-qdataschema -L../editor -lqtscriptedit
+LIBS += -L../../lib -lananas -lqt4designer -L../../lib/designer -lananasplugin -lqdataschema -L../editor -lqtscriptedit
 unix {
     #LIBS += -L$(QTINC)/QtDesigner
     LIBS += -lQtDesignerComponents

diff --git a/src/lib/lib.pro b/src/lib/lib.pro
index 39b3818..1709387 100644 (file)
--- a/src/lib/lib.pro
+++ b/src/lib/lib.pro
@@ -14,7 +14,7 @@ DESTDIR = ../../lib
 DLLDESTDIR = ../../bin
 
 INCLUDEPATH += ../lib ../plugins
-LIBS += -L../../lib -lqt4-qdataschema
+LIBS += -L../../lib -lqdataschema
 
 shared {
     win32:DEFINES += ANANAS_DLL

diff --git a/src/test/test.pro b/src/test/test.pro
index f0ffb83..3f9e3a5 100644 (file)
--- a/src/test/test.pro
+++ b/src/test/test.pro
@@ -17,4 +17,4 @@ FORMS =
 TEMPLATE       =app
 INCLUDEPATH    += ../lib ../plugins
 LIBS   += -L$(QTDIR)/lib -lqsa -L../../lib -lananas
-LIBS   += -L../../lib/designer -lananasplugin -lqt4-qdataschema
+LIBS   += -L../../lib/designer -lananasplugin -lqdataschema