upgrade package qt

doc/index.html

@@ -339,9 +339,14 @@ If a cross compiler is detected then cross compile mode will be used.</pre>
     <pre><span class="target">i686-pc-mingw32</span>-qmake
 make</pre>
     <p>
-    If you are using Qt plugins
-    such as database drivers or graphics plugins,
-    you should also have a look at the
+    Since Qt 4.7-beta2, Qt in mingw-cross-env has the sql drivers (-qt-sql-*)
+    and image handlers for jpeg, tiff, gif, and mng <b>built-in</b> instead of as plugins.
+    To build the image handlers this way, we use backported patches that are expected to
+    appear in a 4.7 release, so this might be different from what you are used to.
+    </p>
+    <p>
+    If you are using Qt plugins such as the svg or ico image handler plugins,
+    you still should have a look at the
     <a href="http://qt.nokia.com/doc/plugins-howto.html#static-plugins">Qt documentation about static plugins</a>.
     </p>
 

src/qt.mk

@@ -4,8 +4,8 @@
 # Qt
 PKG             := qt
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.7.0-beta1
-$(PKG)_CHECKSUM := ae3c3b0fa6e50d333c4bcac7ecd8c50078273046
+$(PKG)_VERSION  := 4.7.0-rc1
+$(PKG)_CHECKSUM := d34f2c277ce153dc18d66b8c5bce405714f1cb4b
 $(PKG)_SUBDIR   := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://qt.nokia.com/
@@ -21,17 +21,18 @@ endef
 
 define $(PKG)_BUILD
 
+    cd '$(1)' && QTDIR='$(1)' ./bin/syncqt
+
     # We prefer static mingw-cross-env system libs for static build:
     # -system-zlib -system-libpng -system-libjpeg -system-libtiff -system-libmng -system-sqlite
-    # There is no -system-gif option. NB -system-libmng will not link in shared build.
-    # Linking QtNetwork4.dll requires OPENSSL_LIBS as does linking apps with static Qt.
-    # Linking qsqlpsql4.dll plugin requires PSQL_LIBS as does linking apps with static Qt.
+    # There is no -system-gif option.
+    #
     # For shared Qt with qt-zlib, add -lQtCore4 to end of OPENSSL_LIBS to satisfy zlib dependency.
-    # -no-largefile does not really disable large file support, it just prevents defining
-    # QT_LARGEFILE_SUPPORT 64 which is not intended for win32.
     cd '$(1)' && \
         OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \
         PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl` -lws2_32" \
+        SYBASE_LIBS="-lsybdb -liconv -lws2_32" \
+        MAKEFLAGS="-j '$(JOBS)'" \
         ./configure \
         -opensource \
         -confirm-license \
@@ -57,10 +58,10 @@ define $(PKG)_BUILD
         -nomake demos \
         -nomake docs \
         -nomake examples \
-        -plugin-sql-sqlite \
-        -plugin-sql-odbc \
-        -plugin-sql-psql \
-        -plugin-sql-tds \
+        -qt-sql-sqlite \
+        -qt-sql-odbc \
+        -qt-sql-psql \
+        -qt-sql-tds -D Q_USE_SYBASE \
         -system-zlib \
         -system-libpng \
         -system-libjpeg \