You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
45 lines
2.3 KiB
45 lines
2.3 KiB
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 |
|
--- qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.cpp.ibase 2015-05-07 09:14:42.000000000 -0500 |
|
+++ qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.cpp 2016-11-30 10:55:05.825339674 -0600 |
|
@@ -39,7 +39,7 @@ |
|
** |
|
****************************************************************************/ |
|
|
|
-#include <ibase.h> |
|
+#include <firebird/ibase.h> |
|
|
|
int main(int, char **) |
|
{ |
|
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 |
|
--- qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.pro.ibase 2015-05-07 09:14:42.000000000 -0500 |
|
+++ qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.pro 2016-11-30 10:56:11.017740104 -0600 |
|
@@ -1,4 +1,4 @@ |
|
SOURCES = ibase.cpp |
|
CONFIG -= qt dylib |
|
mac:CONFIG -= app_bundle |
|
-LIBS += -lgds |
|
+LIBS += -lfbclient |
|
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 |
|
--- qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.h.ibase 2015-05-07 09:14:48.000000000 -0500 |
|
+++ qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.h 2016-11-30 10:57:34.516252974 -0600 |
|
@@ -45,7 +45,7 @@ |
|
#include <QtSql/qsqlresult.h> |
|
#include <QtSql/qsqldriver.h> |
|
#include <QtSql/private/qsqlcachedresult_p.h> |
|
-#include <ibase.h> |
|
+#include <firebird/ibase.h> |
|
|
|
QT_BEGIN_HEADER |
|
|
|
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 |
|
--- qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.pri.ibase 2015-05-07 09:14:48.000000000 -0500 |
|
+++ qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.pri 2016-11-30 10:57:11.783113341 -0600 |
|
@@ -2,7 +2,7 @@ HEADERS += $$PWD/qsql_ibase.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.*) { |
|
win32-borland:LIBS += gds32.lib
|
|
|