|
Rex Dieter |
2c45da7 |
diff -up qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.cpp.ibase qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.cpp
|
|
Rex Dieter |
2c45da7 |
--- qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.cpp.ibase 2015-05-07 09:14:42.000000000 -0500
|
|
Rex Dieter |
2c45da7 |
+++ qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.cpp 2016-11-30 10:55:05.825339674 -0600
|
|
Rex Dieter |
2c45da7 |
@@ -39,7 +39,7 @@
|
|
Rex Dieter |
2c45da7 |
**
|
|
Rex Dieter |
2c45da7 |
****************************************************************************/
|
|
Rex Dieter |
2c45da7 |
|
|
Rex Dieter |
2c45da7 |
-#include <ibase.h>
|
|
Rex Dieter |
2c45da7 |
+#include <firebird/ibase.h>
|
|
Rex Dieter |
2c45da7 |
|
|
Rex Dieter |
2c45da7 |
int main(int, char **)
|
|
Rex Dieter |
2c45da7 |
{
|
|
Rex Dieter |
2c45da7 |
diff -up qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.pro.ibase qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.pro
|
|
Rex Dieter |
2c45da7 |
--- qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.pro.ibase 2015-05-07 09:14:42.000000000 -0500
|
|
Rex Dieter |
2c45da7 |
+++ qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.pro 2016-11-30 10:56:11.017740104 -0600
|
|
Rex Dieter |
2c45da7 |
@@ -1,4 +1,4 @@
|
|
Rex Dieter |
2c45da7 |
SOURCES = ibase.cpp
|
|
Rex Dieter |
2c45da7 |
CONFIG -= qt dylib
|
|
Rex Dieter |
2c45da7 |
mac:CONFIG -= app_bundle
|
|
Rex Dieter |
2c45da7 |
-LIBS += -lgds
|
|
Rex Dieter |
2c45da7 |
+LIBS += -lfbclient
|
|
Rex Dieter |
2c45da7 |
diff -up qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.h.ibase qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.h
|
|
Rex Dieter |
2c45da7 |
--- qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.h.ibase 2015-05-07 09:14:48.000000000 -0500
|
|
Rex Dieter |
2c45da7 |
+++ qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.h 2016-11-30 10:57:34.516252974 -0600
|
|
Rex Dieter |
2c45da7 |
@@ -45,7 +45,7 @@
|
|
Rex Dieter |
2c45da7 |
#include <QtSql/qsqlresult.h>
|
|
Rex Dieter |
2c45da7 |
#include <QtSql/qsqldriver.h>
|
|
Rex Dieter |
2c45da7 |
#include <QtSql/private/qsqlcachedresult_p.h>
|
|
Rex Dieter |
2c45da7 |
-#include <ibase.h>
|
|
Rex Dieter |
2c45da7 |
+#include <firebird/ibase.h>
|
|
Rex Dieter |
2c45da7 |
|
|
Rex Dieter |
2c45da7 |
QT_BEGIN_HEADER
|
|
Rex Dieter |
2c45da7 |
|
|
Rex Dieter |
2c45da7 |
diff -up qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.pri.ibase qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.pri
|
|
Rex Dieter |
2c45da7 |
--- qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.pri.ibase 2015-05-07 09:14:48.000000000 -0500
|
|
Rex Dieter |
2c45da7 |
+++ qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.pri 2016-11-30 10:57:11.783113341 -0600
|
|
Rex Dieter |
2c45da7 |
@@ -2,7 +2,7 @@ HEADERS += $$PWD/qsql_ibase.h
|
|
Rex Dieter |
2c45da7 |
SOURCES += $$PWD/qsql_ibase.cpp
|
|
Rex Dieter |
2c45da7 |
|
|
Rex Dieter |
2c45da7 |
unix {
|
|
Rex Dieter |
2c45da7 |
- !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lgds
|
|
Rex Dieter |
2c45da7 |
+ !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lfbclient
|
|
Rex Dieter |
2c45da7 |
} else {
|
|
Rex Dieter |
2c45da7 |
!contains(LIBS, .*gds.*):!contains(LIBS, .*fbclient.*) {
|
|
Rex Dieter |
2c45da7 |
win32-borland:LIBS += gds32.lib
|