qtbase-firebird.patch 925 B

123456789101112131415161718192021222324252627282930313233
  1. diff --git a/cmake/FindInterbase.cmake b/cmake/FindInterbase.cmake
  2. index 22f866d8..4ef16e75 100644
  3. --- a/cmake/FindInterbase.cmake
  4. +++ b/cmake/FindInterbase.cmake
  5. @@ -19,12 +19,12 @@
  6. # The Interbase client library
  7. find_path(Interbase_INCLUDE_DIR
  8. - NAMES ibase.h
  9. + NAMES firebird/ibase.h
  10. HINTS ${Interbase_INCLUDEDIR}
  11. )
  12. find_library(Interbase_LIBRARY
  13. - NAMES firebase_ms fbclient gds
  14. + NAMES firebase_ms fbclient gds fbclient
  15. HINTS ${Interbase_LIBDIR}
  16. )
  17. diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
  18. index 9109c2b4..7477d5ee 100644
  19. --- a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
  20. +++ b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
  21. @@ -52,7 +52,7 @@
  22. //
  23. #include <QtSql/qsqldriver.h>
  24. -#include <ibase.h>
  25. +#include <firebird/ibase.h>
  26. #ifdef QT_PLUGIN
  27. #define Q_EXPORT_SQLDRIVER_IBASE