2016-11-29 13:15:27 +00:00
|
|
|
diff -up qtbase-opensource-src-5.7.1/config.tests/unix/ibase/ibase.cpp.than qtbase-opensource-src-5.7.1/config.tests/unix/ibase/ibase.cpp
|
|
|
|
|
--- qtbase-opensource-src-5.7.1/config.tests/unix/ibase/ibase.cpp.than 2016-11-28 11:53:02.621749003 -0500
|
|
|
|
|
+++ qtbase-opensource-src-5.7.1/config.tests/unix/ibase/ibase.cpp 2016-11-28 11:53:17.072001489 -0500
|
|
|
|
|
@@ -37,7 +37,7 @@
|
|
|
|
|
**
|
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
|
|
-#include <ibase.h>
|
|
|
|
|
+#include <firebird/ibase.h>
|
|
|
|
|
|
|
|
|
|
int main(int, char **)
|
|
|
|
|
{
|
|
|
|
|
diff -up qtbase-opensource-src-5.7.1/config.tests/unix/ibase/ibase.pro.than qtbase-opensource-src-5.7.1/config.tests/unix/ibase/ibase.pro
|
|
|
|
|
--- qtbase-opensource-src-5.7.1/config.tests/unix/ibase/ibase.pro.than 2016-11-29 08:00:35.270039482 -0500
|
|
|
|
|
+++ qtbase-opensource-src-5.7.1/config.tests/unix/ibase/ibase.pro 2016-11-29 08:00:41.280142713 -0500
|
|
|
|
|
@@ -1,3 +1,3 @@
|
|
|
|
|
SOURCES = ibase.cpp
|
|
|
|
|
CONFIG -= qt dylib
|
|
|
|
|
-LIBS += -lgds
|
|
|
|
|
+LIBS += -lfbclient
|
|
|
|
|
diff -up qtbase-opensource-src-5.7.1/src/plugins/sqldrivers/ibase/ibase.pro.than qtbase-opensource-src-5.7.1/src/plugins/sqldrivers/ibase/ibase.pro
|
|
|
|
|
diff -up qtbase-opensource-src-5.7.1/src/sql/drivers/ibase/qsql_ibase.pri.than qtbase-opensource-src-5.7.1/src/sql/drivers/ibase/qsql_ibase.pri
|
|
|
|
|
--- qtbase-opensource-src-5.7.1/src/sql/drivers/ibase/qsql_ibase.pri.than 2016-11-29 08:04:26.344004252 -0500
|
|
|
|
|
+++ qtbase-opensource-src-5.7.1/src/sql/drivers/ibase/qsql_ibase.pri 2016-11-29 08:04:56.684523066 -0500
|
|
|
|
|
@@ -2,7 +2,7 @@ HEADERS += $$PWD/qsql_ibase_p.h
|
|
|
|
|
SOURCES += $$PWD/qsql_ibase.cpp
|
|
|
|
|
|
|
|
|
|
unix {
|
|
|
|
|
- !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lgds
|
|
|
|
|
+ !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lfbclient
|
|
|
|
|
} else {
|
|
|
|
|
!contains(LIBS, .*gds.*):!contains(LIBS, .*fbclient.*) {
|
|
|
|
|
LIBS += -lgds32_ms
|
2016-11-29 13:46:38 +00:00
|
|
|
diff -up qtbase-opensource-src-5.7.1/src/sql/drivers/ibase/qsql_ibase_p.h.than qtbase-opensource-src-5.7.1/src/sql/drivers/ibase/qsql_ibase_p.h
|
|
|
|
|
--- qtbase-opensource-src-5.7.1/src/sql/drivers/ibase/qsql_ibase_p.h.than 2016-11-29 08:27:25.917767879 -0500
|
|
|
|
|
+++ qtbase-opensource-src-5.7.1/src/sql/drivers/ibase/qsql_ibase_p.h 2016-11-29 08:27:53.338244987 -0500
|
|
|
|
|
@@ -52,7 +52,7 @@
|
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
#include <QtSql/qsqldriver.h>
|
|
|
|
|
-#include <ibase.h>
|
|
|
|
|
+#include <firebird/ibase.h>
|
|
|
|
|
|
|
|
|
|
#ifdef QT_PLUGIN
|
|
|
|
|
#define Q_EXPORT_SQLDRIVER_IBASE
|
