Mercurial > mxe-octave
changeset 757:626db4cc707e
update package qt
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Mon, 15 Feb 2010 21:37:49 +0100 |
| parents | cd954a8ea7d7 |
| children | 1f5b2dfe8966 |
| files | src/qt-win32.patch src/qt.mk |
| diffstat | 2 files changed, 8 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/qt-win32.patch Tue Feb 16 03:51:46 2010 +0100 +++ b/src/qt-win32.patch Mon Feb 15 21:37:49 2010 +0100 @@ -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 @@ 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 @@ 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 @@ 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 @@ #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 @@
--- a/src/qt.mk Tue Feb 16 03:51:46 2010 +0100 +++ b/src/qt.mk Mon Feb 15 21:37:49 2010 +0100 @@ -4,8 +4,8 @@ # Qt PKG := qt $(PKG)_IGNORE := -$(PKG)_VERSION := 4.6.1 -$(PKG)_CHECKSUM := d3b44ae6d9bc9c44fc57f32e545b92daf0b54775 +$(PKG)_VERSION := 4.6.2 +$(PKG)_CHECKSUM := 977c10b88a2230e96868edc78a9e3789c0fcbf70 $(PKG)_SUBDIR := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://qt.nokia.com/