summaryrefslogtreecommitdiffstats
path: root/src/qt-win32.patch
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2010-02-15 20:37:49 (GMT)
committerMark Brand <mabrand@mabrand.nl>2010-02-15 20:37:49 (GMT)
commit1ec507a833a5b9b543222a88efbeed5229d3d745 (patch)
tree90712f3555c0aaf233ecc14b2874c621198610be /src/qt-win32.patch
parent112ec2c8fcd365af2ce5a7ad5786f233e2e00f82 (diff)
downloadmxe-1ec507a833a5b9b543222a88efbeed5229d3d745.zip
mxe-1ec507a833a5b9b543222a88efbeed5229d3d745.tar.gz
mxe-1ec507a833a5b9b543222a88efbeed5229d3d745.tar.bz2
update package qt
Diffstat (limited to 'src/qt-win32.patch')
-rw-r--r--src/qt-win32.patch14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/qt-win32.patch b/src/qt-win32.patch
index 23d0133..0a98ced 100644
--- a/src/qt-win32.patch
+++ b/src/qt-win32.patch
@@ -1,8 +1,6 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
+# This file is part of mingw-cross-env.
diff --git a/configure b/configure
-index 033f415..becf8ea 100755
+index ed5891f..3873d7f 100755
--- a/configure
+++ b/configure
@@ -605,7 +605,7 @@ mkdir -p "$outpath/config.tests"
@@ -669,7 +667,7 @@ index 29fbada..0a38ee4 100644
include(../qsqldriverbase.pri)
diff --git a/src/plugins/sqldrivers/tds/main.cpp b/src/plugins/sqldrivers/tds/main.cpp
-index 33c1d78..e5af5a6 100644
+index eb654ef..0a17f17 100644
--- a/src/plugins/sqldrivers/tds/main.cpp
+++ b/src/plugins/sqldrivers/tds/main.cpp
@@ -47,6 +47,7 @@
@@ -696,7 +694,7 @@ index 08a166b..f66d5b7 100644
win32-borland:LIBS *= $(BCB)/lib/PSDK/NTWDBLIB.LIB
}
diff --git a/src/qbase.pri b/src/qbase.pri
-index d1a2a75..59eeb1b 100644
+index 710a2b6..2c3e91c 100644
--- a/src/qbase.pri
+++ b/src/qbase.pri
@@ -85,7 +85,6 @@ win32-borland {
@@ -737,7 +735,7 @@ index 184eca9..aac0267 100644
contains(sql-drivers, mysql) {
diff --git a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp
-index ab1c283..b3c89d0 100644
+index 422f866..16785ed 100644
--- a/src/sql/drivers/tds/qsql_tds.cpp
+++ b/src/sql/drivers/tds/qsql_tds.cpp
@@ -47,7 +47,8 @@
@@ -751,7 +749,7 @@ index ab1c283..b3c89d0 100644
#include <qvariant.h>
diff --git a/src/sql/drivers/tds/qsql_tds.h b/src/sql/drivers/tds/qsql_tds.h
-index ab2b808..31c3178 100644
+index cb318f3..a6354ce 100644
--- a/src/sql/drivers/tds/qsql_tds.h
+++ b/src/sql/drivers/tds/qsql_tds.h
@@ -48,7 +48,8 @@