diff options
author | Volker Grabsch <vog@notjusthosting.com> | 2009-12-06 11:07:15 (GMT) |
---|---|---|
committer | Volker Grabsch <vog@notjusthosting.com> | 2009-12-06 11:07:15 (GMT) |
commit | f09cef0d57867e11e341b4806232986b2bcc1138 (patch) | |
tree | 25c7786dd1d71fabd338b595aa88926ff6d75ad6 /src | |
parent | c0414a30f22fc5c4e0587693b9d8e230a6a1099c (diff) | |
download | mxe-f09cef0d57867e11e341b4806232986b2bcc1138.zip mxe-f09cef0d57867e11e341b4806232986b2bcc1138.tar.gz mxe-f09cef0d57867e11e341b4806232986b2bcc1138.tar.bz2 |
improvements for package qt (by Mark Brand)
Diffstat (limited to 'src')
-rw-r--r-- | src/qt-win32.patch | 1111 | ||||
-rw-r--r-- | src/qt.mk | 31 |
2 files changed, 116 insertions, 1026 deletions
diff --git a/src/qt-win32.patch b/src/qt-win32.patch index 49e1507..fc2b61c 100644 --- a/src/qt-win32.patch +++ b/src/qt-win32.patch @@ -23,7 +23,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff -urN a/configure b/configure --- a/configure 2009-11-27 02:27:48.000000000 +0100 -+++ b/configure 2009-12-04 10:30:44.000000000 +0100 ++++ b/configure 2009-12-05 20:26:31.000000000 +0100 @@ -591,7 +591,7 @@ rm -f "$outpath/config.tests/.qmake.cache" cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache" @@ -376,119 +376,9 @@ diff -urN a/configure b/configure *s60main/s60main.pro) continue ;; *examples/activeqt/*) continue ;; */qmake/qmake.pro) continue ;; -diff -urN a/demos/spreadsheet/spreadsheet.pro b/demos/spreadsheet/spreadsheet.pro ---- a/demos/spreadsheet/spreadsheet.pro 2009-11-27 02:27:41.000000000 +0100 -+++ b/demos/spreadsheet/spreadsheet.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -8,7 +8,7 @@ - INCLUDEPATH += . - - CONFIG += qt warn_on --#unix:contains(QT_CONFIG, dbus):QT += dbus -+#unix:!win32:contains(QT_CONFIG, dbus):QT += dbus - - # Input - HEADERS += printview.h spreadsheet.h spreadsheetdelegate.h spreadsheetitem.h -diff -urN a/doc/src/snippets/qmake/scopes.pro b/doc/src/snippets/qmake/scopes.pro ---- a/doc/src/snippets/qmake/scopes.pro 2009-11-27 02:27:44.000000000 +0100 -+++ b/doc/src/snippets/qmake/scopes.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -17,7 +17,7 @@ - } - #! [1] - --unix { -+unix:!win32 { - SOURCES += paintwidget_unix.cpp - } - -diff -urN a/doc/src/snippets/qmake/spaces.pro b/doc/src/snippets/qmake/spaces.pro ---- a/doc/src/snippets/qmake/spaces.pro 2009-11-27 02:27:44.000000000 +0100 -+++ b/doc/src/snippets/qmake/spaces.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -1,9 +1,9 @@ - #! [quoting library paths with spaces] - win32:LIBS += $$quote(C:/mylibs/extra libs/extra.lib) --unix:LIBS += $$quote(-L/home/user/extra libs) -lextra -+unix:!win32:LIBS += $$quote(-L/home/user/extra libs) -lextra - #! [quoting library paths with spaces] - - #! [quoting include paths with spaces] - win32:INCLUDEPATH += $$quote(C:/mylibs/extra headers) --unix:INCLUDEPATH += $$quote(/home/user/extra headers) -+unix:!win32:INCLUDEPATH += $$quote(/home/user/extra headers) - #! [quoting include paths with spaces] -diff -urN a/examples/itemviews/chart/chart.pro b/examples/itemviews/chart/chart.pro ---- a/examples/itemviews/chart/chart.pro 2009-11-27 02:27:48.000000000 +0100 -+++ b/examples/itemviews/chart/chart.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -4,7 +4,7 @@ - SOURCES = main.cpp \ - mainwindow.cpp \ - pieview.cpp --unix:!mac:!symbian:!vxworks:LIBS+= -lm -+unix:!win32:!mac:!symbian:!vxworks:LIBS+= -lm - - TARGET.EPOCHEAPSIZE = 0x200000 0x800000 - -diff -urN a/examples/painting/painterpaths/painterpaths.pro b/examples/painting/painterpaths/painterpaths.pro ---- a/examples/painting/painterpaths/painterpaths.pro 2009-11-27 02:27:48.000000000 +0100 -+++ b/examples/painting/painterpaths/painterpaths.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -3,7 +3,7 @@ - SOURCES = main.cpp \ - renderarea.cpp \ - window.cpp --unix:!mac:!symbian:!vxworks:LIBS += -lm -+unix:!win32:!mac:!symbian:!vxworks:LIBS += -lm - - # install - target.path = $$[QT_INSTALL_EXAMPLES]/painting/painterpaths -diff -urN a/examples/threads/mandelbrot/mandelbrot.pro b/examples/threads/mandelbrot/mandelbrot.pro ---- a/examples/threads/mandelbrot/mandelbrot.pro 2009-11-27 02:27:48.000000000 +0100 -+++ b/examples/threads/mandelbrot/mandelbrot.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -4,7 +4,7 @@ - mandelbrotwidget.cpp \ - renderthread.cpp - --unix:!mac:!symbian:!vxworks:LIBS += -lm -+unix:!win32:!mac:!symbian:!vxworks:LIBS += -lm - - # install - target.path = $$[QT_INSTALL_EXAMPLES]/threads/mandelbrot -diff -urN a/lib/qjpeg.prl b/lib/qjpeg.prl ---- a/lib/qjpeg.prl 1970-01-01 01:00:00.000000000 +0100 -+++ b/lib/qjpeg.prl 2009-12-04 10:30:44.000000000 +0100 -@@ -0,0 +1 @@ -+QMAKE_PRL_LIBS = -ljpeg -diff -urN a/lib/qmng.prl b/lib/qmng.prl ---- a/lib/qmng.prl 1970-01-01 01:00:00.000000000 +0100 -+++ b/lib/qmng.prl 2009-12-04 10:30:44.000000000 +0100 -@@ -0,0 +1 @@ -+QMAKE_PRL_LIBS = -lmng -diff -urN a/lib/qsqlite.prl b/lib/qsqlite.prl ---- a/lib/qsqlite.prl 1970-01-01 01:00:00.000000000 +0100 -+++ b/lib/qsqlite.prl 2009-12-04 10:30:44.000000000 +0100 -@@ -0,0 +1 @@ -+QMAKE_PRL_LIBS = -lsqlite3 -diff -urN a/lib/qsqlodbc.prl b/lib/qsqlodbc.prl ---- a/lib/qsqlodbc.prl 1970-01-01 01:00:00.000000000 +0100 -+++ b/lib/qsqlodbc.prl 2009-12-04 10:30:44.000000000 +0100 -@@ -0,0 +1 @@ -+QMAKE_PRL_LIBS = -lodbc32 -diff -urN a/lib/qsqlpsql.prl b/lib/qsqlpsql.prl ---- a/lib/qsqlpsql.prl 1970-01-01 01:00:00.000000000 +0100 -+++ b/lib/qsqlpsql.prl 2009-12-04 10:30:44.000000000 +0100 -@@ -0,0 +1 @@ -+QMAKE_PRL_LIBS = -lpq -diff -urN a/lib/qsqltds.prl b/lib/qsqltds.prl ---- a/lib/qsqltds.prl 1970-01-01 01:00:00.000000000 +0100 -+++ b/lib/qsqltds.prl 2009-12-04 10:30:44.000000000 +0100 -@@ -0,0 +1 @@ -+QMAKE_PRL_LIBS = -lsybdb -liconv -diff -urN a/lib/qtiff.prl b/lib/qtiff.prl ---- a/lib/qtiff.prl 1970-01-01 01:00:00.000000000 +0100 -+++ b/lib/qtiff.prl 2009-12-04 10:30:44.000000000 +0100 -@@ -0,0 +1 @@ -+QMAKE_PRL_LIBS = -ltiff diff -urN a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf --- a/mkspecs/win32-g++/qmake.conf 2009-11-27 02:27:45.000000000 +0100 -+++ b/mkspecs/win32-g++/qmake.conf 2009-12-04 10:30:44.000000000 +0100 ++++ b/mkspecs/win32-g++/qmake.conf 2009-12-05 20:26:31.000000000 +0100 @@ -3,23 +3,31 @@ # # Written for MinGW @@ -597,179 +487,9 @@ diff -urN a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf QMAKE_STRIPFLAGS_LIB += --strip-unneeded -load(qt_config) +PKG_CONFIG = HOSTPLATFORMPREFIX-pkg-config -diff -urN a/projects.pro b/projects.pro ---- a/projects.pro 2009-11-27 02:27:45.000000000 +0100 -+++ b/projects.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -55,7 +55,7 @@ - - !symbian: confclean.depends += clean - confclean.commands = --unix:!symbian { -+unix:!win32:!symbian { - confclean.commands += (cd config.tests/unix/stl && $(MAKE) distclean); \ - (cd config.tests/unix/endian && $(MAKE) distclean); \ - (cd config.tests/unix/ipv6 && $(MAKE) distclean); \ -diff -urN a/qmake/qmake.pri b/qmake/qmake.pri ---- a/qmake/qmake.pri 2009-11-27 02:27:48.000000000 +0100 -+++ b/qmake/qmake.pri 2009-12-04 10:30:44.000000000 +0100 -@@ -117,7 +117,7 @@ - qxmlstream.h \ - qxmlutils.h - -- unix { -+ unix:!win32 { - SOURCES += qfsfileengine_unix.cpp qfsfileengine_iterator_unix.cpp - mac { - SOURCES += qcore_mac.cpp qsettings_mac.cpp -diff -urN a/src/3rdparty/javascriptcore/WebKit.pri b/src/3rdparty/javascriptcore/WebKit.pri ---- a/src/3rdparty/javascriptcore/WebKit.pri 2009-11-27 02:27:50.000000000 +0100 -+++ b/src/3rdparty/javascriptcore/WebKit.pri 2009-12-04 10:30:44.000000000 +0100 -@@ -31,7 +31,7 @@ - DEPENDPATH += $$PWD/WebKit/qt/Api - } - --!mac:!unix|symbian { -+!mac:!unix|win32|symbian { - DEFINES += USE_SYSTEM_MALLOC - } - -diff -urN a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro ---- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro 2009-11-27 02:27:48.000000000 +0100 -+++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -34,7 +34,7 @@ - - CONFIG(release):!CONFIG(QTDIR_build) { - contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols -- unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions -+ unix:!win32:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions - } - - linux-*: DEFINES += HAVE_STDINT_H -diff -urN a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro ---- a/src/3rdparty/webkit/WebCore/WebCore.pro 2009-11-27 02:27:50.000000000 +0100 -+++ b/src/3rdparty/webkit/WebCore/WebCore.pro 2009-12-04 15:14:47.000000000 +0100 -@@ -45,17 +45,17 @@ - - GENERATED_SOURCES_DIR_SLASH = $$GENERATED_SOURCES_DIR${QMAKE_DIR_SEP} - --unix { -+unix:!win32 { - QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork - lessThan(QT_MINOR_VERSION, 4): QMAKE_PKGCONFIG_REQUIRES += QtXml - } - --unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections --unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections -+unix:!win32:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections -+unix:!win32:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections - - CONFIG(release):!CONFIG(QTDIR_build) { - contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols -- unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions -+ unix:!win32:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions - } - - linux-*: DEFINES += HAVE_STDINT_H -@@ -2442,6 +2442,11 @@ - LIBS += -luser32 - LIBS += -lwinmm - } -+ #I thought qmake would take care of these -+ win32-g++ { -+ LIBS += -lpthread -+ LIBS += -lws2_32 -+ } - wince*: LIBS += -lmmtimer - - # Files belonging to the Qt 4.3 build -@@ -2477,7 +2482,7 @@ - - } else { - -- unix { -+ unix:!win32 { - - mac { - SOURCES += \ -@@ -2755,7 +2760,7 @@ - xml/XPathVariableReference.cpp - } - --unix:!mac:CONFIG += link_pkgconfig -+unix:!win32:!mac:CONFIG += link_pkgconfig - - contains(DEFINES, ENABLE_XSLT=1) { - FEATURE_DEFINES_JAVASCRIPT += ENABLE_XSLT=1 -@@ -3324,7 +3329,7 @@ - - INSTALLS += target headers - -- unix { -+ unix:!win32 { - CONFIG += create_pc create_prl - QMAKE_PKGCONFIG_LIBDIR = $$target.path - QMAKE_PKGCONFIG_INCDIR = $$headers.path -diff -urN a/src/corelib/arch/generic/arch.pri b/src/corelib/arch/generic/arch.pri ---- a/src/corelib/arch/generic/arch.pri 2009-11-27 02:27:54.000000000 +0100 -+++ b/src/corelib/arch/generic/arch.pri 2009-12-04 10:30:44.000000000 +0100 -@@ -2,5 +2,5 @@ - # 'generic' architecture - # - --unix:SOURCES += qatomic_generic_unix.cpp -+unix:!win32:SOURCES += qatomic_generic_unix.cpp - win32:SOURCES += qatomic_generic_windows.cpp -diff -urN a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri ---- a/src/corelib/codecs/codecs.pri 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/corelib/codecs/codecs.pri 2009-12-04 10:30:44.000000000 +0100 -@@ -19,7 +19,7 @@ - codecs/qutfcodec.cpp \ - codecs/qtextcodecplugin.cpp - --unix { -+unix:!win32 { - SOURCES += codecs/qfontlaocodec.cpp - - contains(QT_CONFIG,iconv) { -diff -urN a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri ---- a/src/corelib/kernel/kernel.pri 2009-11-27 02:27:54.000000000 +0100 -+++ b/src/corelib/kernel/kernel.pri 2009-12-04 10:30:44.000000000 +0100 -@@ -89,7 +89,7 @@ - kernel/qcore_mac.cpp - } - --unix:!symbian { -+unix:!win32:!symbian { - SOURCES += \ - kernel/qcore_unix.cpp \ - kernel/qcrashhandler.cpp \ -diff -urN a/src/corelib/plugin/plugin.pri b/src/corelib/plugin/plugin.pri ---- a/src/corelib/plugin/plugin.pri 2009-11-27 02:27:54.000000000 +0100 -+++ b/src/corelib/plugin/plugin.pri 2009-12-04 10:30:44.000000000 +0100 -@@ -19,7 +19,7 @@ - SOURCES += plugin/qlibrary_win.cpp - } - --unix { -+unix:!win32 { - SOURCES += plugin/qlibrary_unix.cpp - } - -diff -urN a/src/corelib/thread/thread.pri b/src/corelib/thread/thread.pri ---- a/src/corelib/thread/thread.pri 2009-11-27 02:27:54.000000000 +0100 -+++ b/src/corelib/thread/thread.pri 2009-12-04 10:30:44.000000000 +0100 -@@ -24,7 +24,7 @@ - thread/qthread.cpp \ - thread/qthreadstorage.cpp - --unix:SOURCES += thread/qmutex_unix.cpp \ -+unix:!win32:SOURCES += thread/qmutex_unix.cpp \ - thread/qthread_unix.cpp \ - thread/qwaitcondition_unix.cpp - diff -urN a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri --- a/src/corelib/tools/tools.pri 2009-11-27 02:27:54.000000000 +0100 -+++ b/src/corelib/tools/tools.pri 2009-12-04 10:30:44.000000000 +0100 ++++ b/src/corelib/tools/tools.pri 2009-12-05 22:54:15.000000000 +0100 @@ -96,8 +96,8 @@ ../3rdparty/zlib/uncompr.c \ ../3rdparty/zlib/zutil.c @@ -777,64 +497,21 @@ diff -urN a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri - unix:LIBS_PRIVATE += -lz -# win32:LIBS += libz.lib + unix|win32-g++:LIBS_PRIVATE += -lz -+ win32-msvc*|win32-icc:LIBS += zdll.lib ++ win32:!win32-g++:LIBS += zdll.lib } DEFINES += HB_EXPORT=Q_CORE_EXPORT -@@ -118,5 +118,5 @@ - ../3rdparty/md4 - - # Note: libm should be present by default becaue this is C++ --!macx-icc:!vxworks:!symbian:unix:LIBS_PRIVATE += -lm -+!macx-icc:!vxworks:!symbian:!win32:unix:LIBS_PRIVATE += -lm - -diff -urN a/src/gui/dialogs/dialogs.pri b/src/gui/dialogs/dialogs.pri ---- a/src/gui/dialogs/dialogs.pri 2009-11-27 02:27:52.000000000 +0100 -+++ b/src/gui/dialogs/dialogs.pri 2009-12-04 10:30:44.000000000 +0100 -@@ -46,7 +46,7 @@ - !win32-borland:!wince*: LIBS += -lshell32 # the filedialog needs this library - } - --!mac:!embedded:!symbian:unix { -+!mac:!embedded:!symbian:!win32:unix { - HEADERS += dialogs/qpagesetupdialog_unix_p.h - SOURCES += dialogs/qprintdialog_unix.cpp \ - dialogs/qpagesetupdialog_unix.cpp -diff -urN a/src/gui/egl/egl.pri b/src/gui/egl/egl.pri ---- a/src/gui/egl/egl.pri 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/gui/egl/egl.pri 2009-12-04 10:30:44.000000000 +0100 -@@ -10,7 +10,7 @@ - - wince*: SOURCES += egl/qegl_wince.cpp - --unix { -+unix:!win32 { - embedded { - SOURCES += egl/qegl_qws.cpp - } else { -diff -urN a/src/gui/gui.pro b/src/gui/gui.pro ---- a/src/gui/gui.pro 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/gui/gui.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -6,7 +6,7 @@ - - !win32:!embedded:!mac:!symbian:CONFIG += x11 - --unix:QMAKE_PKGCONFIG_REQUIRES = QtCore -+unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore - - include(../qbase.pri) - diff -urN a/src/gui/image/image.pri b/src/gui/image/image.pri --- a/src/gui/image/image.pri 2009-11-27 02:27:52.000000000 +0100 -+++ b/src/gui/image/image.pri 2009-12-04 10:30:44.000000000 +0100 ++++ b/src/gui/image/image.pri 2009-12-05 23:46:14.000000000 +0100 @@ -93,11 +93,11 @@ SOURCES += image/qpnghandler.cpp contains(QT_CONFIG, system-png) { - unix:LIBS_PRIVATE += -lpng - win32:LIBS += libpng.lib -+ unix|win32-g++:LIBS_PRIVATE += -lpng -+ win32-msvc*|win32-icc:LIBS += libpng.lib ++ unix|win32-g++:LIBS_PRIVATE += -lpng ++ win32:!win32-g++:LIBS += libpng.lib } else { !isEqual(QT_ARCH, i386):!isEqual(QT_ARCH, x86_64):DEFINES += PNG_NO_ASSEMBLER_CODE - INCLUDEPATH += ../3rdparty/libpng ../3rdparty/zlib @@ -842,33 +519,20 @@ diff -urN a/src/gui/image/image.pri b/src/gui/image/image.pri SOURCES += ../3rdparty/libpng/png.c \ ../3rdparty/libpng/pngerror.c \ ../3rdparty/libpng/pngget.c \ -@@ -114,6 +114,14 @@ - ../3rdparty/libpng/pngwtran.c \ +@@ -115,6 +115,10 @@ ../3rdparty/libpng/pngwutil.c \ ../3rdparty/libpng/pnggccrd.c -+ -+ contains(QT_CONFIG, system-zlib) { -+ unix|win32-g++:LIBS_PRIVATE += -lz -+ win32-msvc*|win32-icc:LIBS += zdll.lib -+ } else { -+ INCLUDEPATH += ../3rdparty/zlib -+ } -+ } ++ contains(QT_CONFIG, system-zlib) { ++ unix|win32-g++:LIBS_PRIVATE += -lz ++ win32:!win32-g++:LIBS += zdll.lib ++ } } else { DEFINES *= QT_NO_IMAGEFORMAT_PNG + } diff -urN a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri --- a/src/gui/painting/painting.pri 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/gui/painting/painting.pri 2009-12-04 10:30:44.000000000 +0100 -@@ -153,7 +153,7 @@ - painting/qprintengine_mac.mm \ - } - --unix:!mac:!symbian { -+unix:!win32:!mac:!symbian { - HEADERS += \ - painting/qprinterinfo_unix_p.h - SOURCES += \ ++++ b/src/gui/painting/painting.pri 2009-12-05 23:34:47.000000000 +0100 @@ -380,9 +380,9 @@ } @@ -879,24 +543,12 @@ diff -urN a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri - unix:LIBS_PRIVATE += -lz -# win32:LIBS += libz.lib + unix|win32-g++:LIBS_PRIVATE += -lz -+ win32-msvc*|win32-icc:LIBS += zdll.lib ++ win32:!win32-g++:LIBS += zdll.lib } -diff -urN a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro ---- a/src/multimedia/multimedia.pro 2009-11-27 02:27:54.000000000 +0100 -+++ b/src/multimedia/multimedia.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -4,7 +4,7 @@ - - DEFINES += QT_BUILD_MULTIMEDIA_LIB QT_NO_USING_NAMESPACE - --unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui -+unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui - - include(../qbase.pri) - diff -urN a/src/network/access/access.pri b/src/network/access/access.pri --- a/src/network/access/access.pri 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/network/access/access.pri 2009-12-04 10:30:44.000000000 +0100 ++++ b/src/network/access/access.pri 2009-12-05 22:54:15.000000000 +0100 @@ -57,8 +57,8 @@ #zlib support @@ -907,118 +559,27 @@ diff -urN a/src/network/access/access.pri b/src/network/access/access.pri - unix:LIBS_PRIVATE += -lz -# win32:LIBS += libz.lib + unix|win32-g++:LIBS_PRIVATE += -lz -+ win32-msvc*|win32-icc:LIBS += zdll.lib - } -diff -urN a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri ---- a/src/network/kernel/kernel.pri 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/network/kernel/kernel.pri 2009-12-04 10:30:44.000000000 +0100 -@@ -21,7 +21,7 @@ - kernel/qnetworkinterface.cpp - - symbian: SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_symbian.cpp --unix:!symbian:SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp -+unix:!win32:!symbian:SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp - win32:SOURCES += kernel/qhostinfo_win.cpp kernel/qnetworkinterface_win.cpp - - mac:LIBS_PRIVATE += -framework SystemConfiguration -framework CoreFoundation -diff -urN a/src/network/network.pro b/src/network/network.pro ---- a/src/network/network.pro 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/network/network.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -13,7 +13,7 @@ - QT = core - win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x64000000 - --unix:QMAKE_PKGCONFIG_REQUIRES = QtCore -+unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore - - include(../qbase.pri) - include(access/access.pri) -diff -urN a/src/network/socket/socket.pri b/src/network/socket/socket.pri ---- a/src/network/socket/socket.pri 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/network/socket/socket.pri 2009-12-04 10:30:44.000000000 +0100 -@@ -25,10 +25,10 @@ - socket/qlocalsocket.cpp \ - socket/qlocalserver.cpp - --unix:SOURCES += socket/qnativesocketengine_unix.cpp \ -+unix:!win32:SOURCES += socket/qnativesocketengine_unix.cpp \ - socket/qlocalsocket_unix.cpp \ - socket/qlocalserver_unix.cpp --unix:HEADERS += \ -+unix:!win32:HEADERS += \ - socket/qnet_unix_p.h - - win32:SOURCES += socket/qnativesocketengine_win.cpp \ -diff -urN a/src/opengl/opengl.pro b/src/opengl/opengl.pro ---- a/src/opengl/opengl.pro 2009-11-27 02:27:52.000000000 +0100 -+++ b/src/opengl/opengl.pro 2009-12-04 12:32:50.000000000 +0100 -@@ -6,7 +6,7 @@ - win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000 - solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 - --unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui -+unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui - - include(../qbase.pri) - -@@ -17,6 +17,9 @@ - contains(QT_CONFIG, opengles2):CONFIG += opengles2 - contains(QT_CONFIG, egl):CONFIG += egl - -+#Thought qmake was supposed to do this. -+LIBS += $$QMAKE_LIBS_OPENGL ++ win32:!win32-g++:LIBS += zdll.lib + } +diff -urN a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri +--- a/src/network/ssl/ssl.pri 2009-11-27 02:27:53.000000000 +0100 ++++ b/src/network/ssl/ssl.pri 2009-12-06 01:41:23.000000000 +0100 +@@ -35,5 +35,12 @@ + RESOURCES += network.qrc + + # Add optional SSL libs ++ !contains(QT_CONFIG, system-zlib):contains(OPENSSL_LIBS, -lz) { ++ #Use the zlib in QtCore ++ #-lz probably came from pkg-config which does not know about QtCore ++ OPENSSL_LIBS -= -lz ++ OPENSSL_LIBS += -lQtCore4 ++ } + LIBS_PRIVATE += $$OPENSSL_LIBS + - HEADERS += qgl.h \ - qgl_p.h \ - qglcolormap.h \ -diff -urN a/src/openvg/openvg.pro b/src/openvg/openvg.pro ---- a/src/openvg/openvg.pro 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/openvg/openvg.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -33,7 +33,7 @@ - - include(../qbase.pri) - --unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui -+unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui - - !isEmpty(QMAKE_INCDIR_OPENVG): INCLUDEPATH += $$QMAKE_INCDIR_OPENVG - !isEmpty(QMAKE_LIBDIR_OPENVG): LIBS_PRIVATE += -L$$QMAKE_LIBDIR_OPENVG -diff -urN a/src/phonon/phonon.pro b/src/phonon/phonon.pro ---- a/src/phonon/phonon.pro 2009-11-27 02:27:52.000000000 +0100 -+++ b/src/phonon/phonon.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -11,7 +11,7 @@ - - PHONON_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/phonon - --unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork -+unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork - - # Input - HEADERS += $$PHONON_DIR/abstractaudiooutput.h \ -@@ -107,7 +107,7 @@ - QT += dbus - HEADERS += $$PHONON_DIR/audiooutputadaptor_p.h - SOURCES += $$PHONON_DIR/audiooutputadaptor.cpp -- unix:QMAKE_PKGCONFIG_REQUIRES += QtDBus -+ unix:!win32:QMAKE_PKGCONFIG_REQUIRES += QtDBus - } else { - DEFINES += QT_NO_DBUS - } -diff -urN a/src/plugins/codecs/jp/jp.pro b/src/plugins/codecs/jp/jp.pro ---- a/src/plugins/codecs/jp/jp.pro 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/plugins/codecs/jp/jp.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -16,7 +16,7 @@ - qjpunicode.cpp \ - main.cpp - --unix { -+unix:!win32 { - HEADERS += qfontjpcodec.h - SOURCES += qfontjpcodec.cpp } diff -urN a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro --- a/src/plugins/imageformats/jpeg/jpeg.pro 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/plugins/imageformats/jpeg/jpeg.pro 2009-12-04 10:30:44.000000000 +0100 ++++ b/src/plugins/imageformats/jpeg/jpeg.pro 2009-12-05 22:11:44.000000000 +0100 @@ -20,8 +20,8 @@ } @@ -1026,199 +587,74 @@ diff -urN a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jp - unix:LIBS += -ljpeg - win32:LIBS += libjpeg.lib + unix|win32-g++:LIBS += -ljpeg -+ win32-msvc*|win32-icc:LIBS += libjpeg.lib ++ win32:!win32-g++:LIBS += libjpeg.lib } !contains(QT_CONFIG, system-jpeg) { INCLUDEPATH += ../../../3rdparty/libjpeg diff -urN a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro --- a/src/plugins/imageformats/mng/mng.pro 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/plugins/imageformats/mng/mng.pro 2009-12-04 13:53:53.000000000 +0100 -@@ -14,10 +14,9 @@ ++++ b/src/plugins/imageformats/mng/mng.pro 2009-12-05 22:16:55.000000000 +0100 +@@ -14,8 +14,8 @@ } contains(QT_CONFIG, system-mng) { - unix:LIBS += -lmng - win32:LIBS += libmng.lib --} --!contains(QT_CONFIG, system-mng) { + unix|win32-g++:LIBS += -lmng -+ win32-msvc*|win32-icc:LIBS += libmng.lib -+} else { ++ win32:!win32-g++:LIBS += libmng.lib + } + !contains(QT_CONFIG, system-mng) { DEFINES += MNG_BUILD_SO - DEFINES += MNG_NO_INCLUDE_JNG - INCLUDEPATH += ../../../3rdparty/libmng -@@ -43,11 +42,16 @@ - ../../../3rdparty/libmng/libmng_zlib.c +@@ -44,10 +44,11 @@ } --contains(QT_CONFIG, system-zlib) { + contains(QT_CONFIG, system-zlib) { - LIBS += -lz -+contains(QT_CONFIG, system-jpeg) { -+ unix|win32-g++:LIBS_PRIVATE += -ljpeg -+ win32-msvc*|win32-icc:LIBS += libjpeg.lib ++ unix|win32-g++:LIBS_PRIVATE += -lz ++ win32:!win32-g++:LIBS += zdll.lib } --!contains(QT_CONFIG, system-zlib) { + !contains(QT_CONFIG, system-zlib) { - INCLUDEPATH += ../../../3rdparty/zlib -+ -+contains(QT_CONFIG, system-zlib) { -+ unix|win32-g++:LIBS_PRIVATE += -lz -+ win32-msvc*|win32-icc:LIBS += zdll.lib -+} else { + INCLUDEPATH += ../../../3rdparty/zlib } QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats diff -urN a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro --- a/src/plugins/imageformats/tiff/tiff.pro 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/plugins/imageformats/tiff/tiff.pro 2009-12-04 15:23:34.000000000 +0100 -@@ -8,10 +8,9 @@ ++++ b/src/plugins/imageformats/tiff/tiff.pro 2009-12-05 22:20:36.000000000 +0100 +@@ -8,8 +8,13 @@ qtiffhandler.cpp contains(QT_CONFIG, system-tiff) { - unix:LIBS += -ltiff - win32:LIBS += libtiff.lib --} --!contains(QT_CONFIG, system-tiff) { + unix|win32-g++:LIBS += -ltiff -+ win32-msvc*|win32-icc:LIBS += libtiff.lib -+} else { ++ win32:!win32-g++:LIBS += libtiff.lib ++ ++ contains(QT_CONFIG, system-jpeg) { ++ unix|win32-g++:LIBS += -ljpeg ++ win32:!win32-g++:LIBS += libjpeg.lib ++ } + } + !contains(QT_CONFIG, system-tiff) { INCLUDEPATH += ../../../3rdparty/libtiff/libtiff - SOURCES += \ - ../../../3rdparty/libtiff/libtiff/tif_aux.c \ -@@ -50,7 +49,7 @@ - win32 { - SOURCES += ../../../3rdparty/libtiff/libtiff/tif_win32.c - } -- unix: { -+ unix:!win32: { - SOURCES += ../../../3rdparty/libtiff/libtiff/tif_unix.c - } - wince*: { -@@ -61,11 +60,18 @@ - } +@@ -62,10 +67,11 @@ } --contains(QT_CONFIG, system-zlib) { + contains(QT_CONFIG, system-zlib) { - LIBS += -lz -+contains(QT_CONFIG, system-jpeg) { -+ unix|win32-g++:LIBS_PRIVATE += -ljpeg -+ win32-msvc*|win32-icc:LIBS += libjpeg.lib -+} else { -+ INCLUDEPATH += ../../../3rdparty/zlib ++ unix|win32-g++:LIBS_PRIVATE += -lz ++ win32:!win32-g++:LIBS += zdll.lib } --!contains(QT_CONFIG, system-zlib) { + !contains(QT_CONFIG, system-zlib) { - INCLUDEPATH += ../../../3rdparty/zlib -+ -+contains(QT_CONFIG, system-zlib) { -+ unix|win32-g++:LIBS_PRIVATE += -lz -+ win32-msvc*|win32-icc:LIBS += zdll.lib -+} else { + INCLUDEPATH += ../../../3rdparty/zlib } QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats -diff -urN a/src/plugins/phonon/phonon.pro b/src/plugins/phonon/phonon.pro ---- a/src/plugins/phonon/phonon.pro 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/plugins/phonon/phonon.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -2,7 +2,7 @@ - - SUBDIRS = - --unix:contains(QT_CONFIG, gstreamer): SUBDIRS *= gstreamer -+unix:!win32:contains(QT_CONFIG, gstreamer): SUBDIRS *= gstreamer - mac:contains(QT_CONFIG, phonon-backend): SUBDIRS *= qt7 - win32:!wince*:contains(QT_CONFIG, phonon-backend): SUBDIRS *= ds9 - wince*:contains(QT_CONFIG, phonon-backend): SUBDIRS *= waveout -diff -urN a/src/plugins/plugins.pro b/src/plugins/plugins.pro ---- a/src/plugins/plugins.pro 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/plugins/plugins.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -1,7 +1,7 @@ - TEMPLATE = subdirs - - SUBDIRS *= accessible imageformats sqldrivers iconengines script --unix:!symbian { -+unix:!win32:!symbian { - contains(QT_CONFIG,iconv)|contains(QT_CONFIG,gnu-libiconv):SUBDIRS *= codecs - } else { - SUBDIRS *= codecs -diff -urN a/src/plugins/sqldrivers/db2/db2.pro b/src/plugins/sqldrivers/db2/db2.pro ---- a/src/plugins/sqldrivers/db2/db2.pro 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/plugins/sqldrivers/db2/db2.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -4,7 +4,7 @@ - SOURCES = main.cpp \ - ../../../sql/drivers/db2/qsql_db2.cpp - --unix:!contains( LIBS, .*db2.* ):LIBS *= -ldb2 -+unix:!win32:!contains( LIBS, .*db2.* ):LIBS *= -ldb2 - win32:!contains( LIBS, .*db2.* ):LIBS *= -ldb2cli - - include(../qsqldriverbase.pri) -diff -urN a/src/plugins/sqldrivers/ibase/ibase.pro b/src/plugins/sqldrivers/ibase/ibase.pro ---- a/src/plugins/sqldrivers/ibase/ibase.pro 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/plugins/sqldrivers/ibase/ibase.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -4,9 +4,9 @@ - SOURCES = main.cpp \ - ../../../sql/drivers/ibase/qsql_ibase.cpp - --unix:!contains( LIBS, .*gds.* ):!contains( LIBS, .*libfb.* ):LIBS *= -lgds -+unix:!win32:!contains( LIBS, .*gds.* ):!contains( LIBS, .*libfb.* ):LIBS *= -lgds - --win32:!contains( LIBS, .*gds.* ):!contains( LIBS, .*fbclient.* ) { -+!unix:win32:!contains( LIBS, .*gds.* ):!contains( LIBS, .*fbclient.* ) { - !win32-borland:LIBS *= -lgds32_ms - win32-borland:LIBS += gds32.lib - } -diff -urN a/src/plugins/sqldrivers/mysql/mysql.pro b/src/plugins/sqldrivers/mysql/mysql.pro ---- a/src/plugins/sqldrivers/mysql/mysql.pro 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/plugins/sqldrivers/mysql/mysql.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -4,7 +4,7 @@ - SOURCES = main.cpp \ - ../../../sql/drivers/mysql/qsql_mysql.cpp - --unix: { -+unix:!win32: { - isEmpty(QT_LFLAGS_MYSQL) { - !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) { - use_libmysqlclient_r:LIBS *= -lmysqlclient_r -diff -urN a/src/plugins/sqldrivers/oci/oci.pro b/src/plugins/sqldrivers/oci/oci.pro ---- a/src/plugins/sqldrivers/oci/oci.pro 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/plugins/sqldrivers/oci/oci.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -6,7 +6,7 @@ - - win32:LIBS *= -loci - --unix:!contains( LIBS, .*clnts.* ):LIBS *= -lclntsh -+unix:!win32:!contains( LIBS, .*clnts.* ):LIBS *= -lclntsh - - macx:QMAKE_LFLAGS += -Wl,-flat_namespace,-U,_environ - -diff -urN a/src/plugins/sqldrivers/odbc/odbc.pro b/src/plugins/sqldrivers/odbc/odbc.pro ---- a/src/plugins/sqldrivers/odbc/odbc.pro 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/plugins/sqldrivers/odbc/odbc.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -4,7 +4,7 @@ - SOURCES = main.cpp \ - ../../../sql/drivers/odbc/qsql_odbc.cpp - --unix { -+unix:!win32 { - !contains( LIBS, .*odbc.* ) { - LIBS *= $$QT_LFLAGS_ODBC - } -diff -urN a/src/plugins/sqldrivers/psql/psql.pro b/src/plugins/sqldrivers/psql/psql.pro ---- a/src/plugins/sqldrivers/psql/psql.pro 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/plugins/sqldrivers/psql/psql.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -4,7 +4,7 @@ - SOURCES = main.cpp \ - ../../../sql/drivers/psql/qsql_psql.cpp - --unix: { -+unix:!win32: { - !isEmpty(QT_LFLAGS_PSQL) { - LIBS *= $$QT_LFLAGS_PSQL - QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL diff -urN a/src/plugins/sqldrivers/tds/main.cpp b/src/plugins/sqldrivers/tds/main.cpp --- a/src/plugins/sqldrivers/tds/main.cpp 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/plugins/sqldrivers/tds/main.cpp 2009-12-04 10:30:44.000000000 +0100 ++++ b/src/plugins/sqldrivers/tds/main.cpp 2009-12-05 20:26:31.000000000 +0100 @@ -47,6 +47,7 @@ #define _WINSCARD_H_ #include <windows.h> @@ -1229,33 +665,21 @@ diff -urN a/src/plugins/sqldrivers/tds/main.cpp b/src/plugins/sqldrivers/tds/mai QT_BEGIN_NAMESPACE diff -urN a/src/plugins/sqldrivers/tds/tds.pro b/src/plugins/sqldrivers/tds/tds.pro --- a/src/plugins/sqldrivers/tds/tds.pro 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/plugins/sqldrivers/tds/tds.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -5,11 +5,6 @@ - SOURCES = main.cpp \ ++++ b/src/plugins/sqldrivers/tds/tds.pro 2009-12-05 22:25:53.000000000 +0100 +@@ -6,8 +6,9 @@ ../../../sql/drivers/tds/qsql_tds.cpp --unix:!contains( LIBS, .*sybdb.* ):LIBS *= -lsybdb -- + unix:!contains( LIBS, .*sybdb.* ):LIBS *= -lsybdb ++win32-g++:LIBS *= -lsybdb -liconv -lws2_32 + -win32 { -- !win32-borland:LIBS *= -lNTWDBLIB -- win32-borland:LIBS *= $(BCB)/lib/PSDK/NTWDBLIB.LIB --} -- -+#Patched to use FreeTDS targetting MinGW -+LIBS *= -lsybdb -liconv -lws2_32 - include(../qsqldriverbase.pri) ++win32:!win32-g++ { + !win32-borland:LIBS *= -lNTWDBLIB + win32-borland:LIBS *= $(BCB)/lib/PSDK/NTWDBLIB.LIB + } diff -urN a/src/qbase.pri b/src/qbase.pri --- a/src/qbase.pri 2009-11-27 02:27:54.000000000 +0100 -+++ b/src/qbase.pri 2009-12-04 10:30:44.000000000 +0100 -@@ -39,7 +39,7 @@ - linux-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF - - contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols --unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions -+unix:!win32:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions - contains(QT_CONFIG, largefile):CONFIG += largefile - - #mac frameworks ++++ b/src/qbase.pri 2009-12-05 20:26:31.000000000 +0100 @@ -85,7 +85,6 @@ } @@ -1264,143 +688,9 @@ diff -urN a/src/qbase.pri b/src/qbase.pri INCLUDEPATH += tmp !static: DEFINES+=QT_MAKEDLL } -@@ -144,7 +143,7 @@ - #install directives - include(qt_install.pri) - --unix:!symbian { -+unix:!win32:!symbian { - CONFIG += create_libtool create_pc explicitlib - QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS] - QMAKE_PRL_LIBDIR = $$[QT_INSTALL_LIBS] -diff -urN a/src/qt3support/network/network.pri b/src/qt3support/network/network.pri ---- a/src/qt3support/network/network.pri 2009-11-27 02:27:54.000000000 +0100 -+++ b/src/qt3support/network/network.pri 2009-12-04 10:30:44.000000000 +0100 -@@ -25,6 +25,6 @@ - network/q3urloperator.cpp - - win32:SOURCES += network/q3socketdevice_win.cpp --unix:SOURCES += network/q3socketdevice_unix.cpp -+unix:!win32:SOURCES += network/q3socketdevice_unix.cpp - mac:LIBS_PRIVATE += -lresolv - -diff -urN a/src/qt3support/other/other.pri b/src/qt3support/other/other.pri ---- a/src/qt3support/other/other.pri 2009-11-27 02:27:54.000000000 +0100 -+++ b/src/qt3support/other/other.pri 2009-12-04 10:30:44.000000000 +0100 -@@ -18,7 +18,7 @@ - other/q3process.cpp \ - other/q3membuf.cpp - --unix:SOURCES += other/q3process_unix.cpp -+unix:!win32:SOURCES += other/q3process_unix.cpp - win32:SOURCES+= other/q3process_win.cpp - - -diff -urN a/src/qt3support/qt3support.pro b/src/qt3support/qt3support.pro ---- a/src/qt3support/qt3support.pro 2009-11-27 02:27:54.000000000 +0100 -+++ b/src/qt3support/qt3support.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -21,7 +21,7 @@ - include(network/network.pri) - include(painting/painting.pri) - --unix { -+unix:!win32 { - QMAKE_PKGCONFIG_CFLAGS += -DQT3_SUPPORT - QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork QtSql - } -diff -urN a/src/script/script.pro b/src/script/script.pro ---- a/src/script/script.pro 2009-11-27 02:27:52.000000000 +0100 -+++ b/src/script/script.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -7,7 +7,7 @@ - DEFINES += QLALR_NO_QSCRIPTGRAMMAR_DEBUG_INFO - #win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 ### FIXME - --unix:QMAKE_PKGCONFIG_REQUIRES = QtCore -+unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore - - include(../qbase.pri) - -diff -urN a/src/scripttools/scripttools.pro b/src/scripttools/scripttools.pro ---- a/src/scripttools/scripttools.pro 2009-11-27 02:27:54.000000000 +0100 -+++ b/src/scripttools/scripttools.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -5,7 +5,7 @@ - DEFINES += QT_NO_USING_NAMESPACE - #win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 - --unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtScript -+unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtScript - - include(../qbase.pri) - -diff -urN a/src/sql/drivers/drivers.pri b/src/sql/drivers/drivers.pri ---- a/src/sql/drivers/drivers.pri 2009-11-27 02:27:52.000000000 +0100 -+++ b/src/sql/drivers/drivers.pri 2009-12-04 10:30:44.000000000 +0100 -@@ -6,7 +6,7 @@ - HEADERS += drivers/psql/qsql_psql.h - SOURCES += drivers/psql/qsql_psql.cpp - -- unix { -+ unix:!win32 { - !isEmpty(QT_LFLAGS_PSQL) { - LIBS *= $$QT_LFLAGS_PSQL - QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL -@@ -25,7 +25,7 @@ - HEADERS += drivers/mysql/qsql_mysql.h - SOURCES += drivers/mysql/qsql_mysql.cpp - -- unix { -+ unix:!win32 { - isEmpty(QT_LFLAGS_MYSQL) { - !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) { - use_libmysqlclient_r:LIBS *= -lmysqlclient_r -@@ -48,7 +48,7 @@ - SOURCES += drivers/odbc/qsql_odbc.cpp - - mac:!contains( LIBS, .*odbc.* ):LIBS *= -liodbc -- unix:!contains( LIBS, .*odbc.* ):LIBS *= -lodbc -+ unix:!win32:!contains( LIBS, .*odbc.* ):LIBS *= -lodbc - - win32 { - !win32-borland:LIBS *= -lodbc32 -@@ -60,7 +60,7 @@ - HEADERS += drivers/oci/qsql_oci.h - SOURCES += drivers/oci/qsql_oci.cpp - -- unix:!contains( LIBS, .*clnts.* ):LIBS += -lclntsh -+ unix:!win32:!contains( LIBS, .*clnts.* ):LIBS += -lclntsh - - win32:LIBS += -loci - } -@@ -71,7 +71,7 @@ - - unix:LIBS += -L$SYBASE/lib -lsybdb - -- win32 { -+ win32:!unix { - !win32-borland:LIBS += -lNTWDBLIB - win32-borland:LIBS += $(BCB)/lib/PSDK/NTWDBLIB.LIB - } -@@ -81,7 +81,7 @@ - HEADERS += drivers/db2/qsql_db2.h - SOURCES += drivers/db2/qsql_db2.cpp - -- unix:LIBS += -ldb2 -+ unix:!win32:LIBS += -ldb2 - - win32 { - !win32-borland:LIBS += -ldb2cli -@@ -93,7 +93,7 @@ - HEADERS += drivers/ibase/qsql_ibase.h - SOURCES += drivers/ibase/qsql_ibase.cpp - -- unix:LIBS *= -lgds -+ unix:!win32:LIBS *= -lgds - - win32 { - !win32-borland:LIBS *= -lgds32_ms diff -urN a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp --- a/src/sql/drivers/tds/qsql_tds.cpp 2009-11-27 02:27:52.000000000 +0100 -+++ b/src/sql/drivers/tds/qsql_tds.cpp 2009-12-04 10:30:44.000000000 +0100 ++++ b/src/sql/drivers/tds/qsql_tds.cpp 2009-12-05 20:26:31.000000000 +0100 @@ -47,7 +47,8 @@ #else #define Q_USE_SYBASE @@ -1413,7 +703,7 @@ diff -urN a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp #include <qvariant.h> diff -urN a/src/sql/drivers/tds/qsql_tds.h b/src/sql/drivers/tds/qsql_tds.h --- a/src/sql/drivers/tds/qsql_tds.h 2009-11-27 02:27:52.000000000 +0100 -+++ b/src/sql/drivers/tds/qsql_tds.h 2009-12-04 10:30:44.000000000 +0100 ++++ b/src/sql/drivers/tds/qsql_tds.h 2009-12-05 20:26:31.000000000 +0100 @@ -48,7 +48,8 @@ #ifdef Q_OS_WIN32 @@ -1424,30 +714,9 @@ diff -urN a/src/sql/drivers/tds/qsql_tds.h b/src/sql/drivers/tds/qsql_tds.h #include <QtCore/qt_windows.h> #include <sqlfront.h> #include <sqldb.h> -diff -urN a/src/sql/sql.pro b/src/sql/sql.pro ---- a/src/sql/sql.pro 2009-11-27 02:27:52.000000000 +0100 -+++ b/src/sql/sql.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -5,7 +5,7 @@ - DEFINES += QT_NO_USING_NAMESPACE - win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x62000000 - --unix:QMAKE_PKGCONFIG_REQUIRES = QtCore -+unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore - - include(../qbase.pri) - diff -urN a/src/svg/svg.pro b/src/svg/svg.pro --- a/src/svg/svg.pro 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/svg/svg.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -6,7 +6,7 @@ - win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 - solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 - --unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui -+unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui - - include(../qbase.pri) - ++++ b/src/svg/svg.pro 2009-12-05 22:54:06.000000000 +0100 @@ -44,7 +44,8 @@ #zlib support @@ -1457,23 +726,11 @@ diff -urN a/src/svg/svg.pro b/src/svg/svg.pro } else:!contains(QT_CONFIG, no-zlib) { - unix:LIBS_PRIVATE += -lz + unix|win32-g++:LIBS_PRIVATE += -lz -+ win32-msvc*|win32-icc:LIBS += zdll.lib ++ win32:!win32-g++:LIBS += zdll.lib } -diff -urN a/src/testlib/testlib.pro b/src/testlib/testlib.pro ---- a/src/testlib/testlib.pro 2009-11-27 02:27:52.000000000 +0100 -+++ b/src/testlib/testlib.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -2,7 +2,7 @@ - QPRO_PWD = $$PWD - QT = core - INCLUDEPATH += . --unix:!embedded:QMAKE_PKGCONFIG_DESCRIPTION = Qt \ -+unix:!win32:!embedded:QMAKE_PKGCONFIG_DESCRIPTION = Qt \ - Unit \ - Testing \ - Library diff -urN a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri --- a/src/tools/bootstrap/bootstrap.pri 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/tools/bootstrap/bootstrap.pri 2009-12-04 10:30:44.000000000 +0100 ++++ b/src/tools/bootstrap/bootstrap.pri 2009-12-05 22:52:58.000000000 +0100 @@ -52,8 +52,8 @@ LIBS += -lbootstrap } @@ -1481,36 +738,27 @@ diff -urN a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pr - unix:LIBS += -lz -# win32:LIBS += libz.lib + unix|win32-g++:LIBS_PRIVATE += -lz -+ win32-msvc*|win32-icc:LIBS += zdll.lib ++ win32:!win32-g++:LIBS += zdll.lib } win32:LIBS += -luser32 diff -urN a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro --- a/src/tools/bootstrap/bootstrap.pro 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/tools/bootstrap/bootstrap.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -82,7 +82,7 @@ - ../../xml/dom/qdom.cpp \ - ../../xml/sax/qxml.cpp - --unix:SOURCES += ../../corelib/io/qfsfileengine_unix.cpp \ -+unix:!win32:SOURCES += ../../corelib/io/qfsfileengine_unix.cpp \ - ../../corelib/io/qfsfileengine_iterator_unix.cpp - - win32:SOURCES += ../../corelib/io/qfsfileengine_win.cpp \ ++++ b/src/tools/bootstrap/bootstrap.pro 2009-12-05 22:54:15.000000000 +0100 @@ -108,6 +108,9 @@ ../3rdparty/zlib/trees.c \ ../3rdparty/zlib/uncompr.c \ ../3rdparty/zlib/zutil.c +} else:!contains(QT_CONFIG, no-zlib) { + unix|win32-g++:LIBS_PRIVATE += -lz -+ win32-msvc*|win32-icc:LIBS += zdll.lib ++ win32:!win32-g++:LIBS += zdll.lib } lib.CONFIG = dummy_install diff -urN a/src/winmain/winmain.pro b/src/winmain/winmain.pro --- a/src/winmain/winmain.pro 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/winmain/winmain.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -11,12 +11,12 @@ ++++ b/src/winmain/winmain.pro 2009-12-05 20:26:31.000000000 +0100 +@@ -11,7 +11,7 @@ win32-g++:DEFINES += QT_NEEDS_QMAIN win32-borland:DEFINES += QT_NEEDS_QMAIN SOURCES = qtmain_win.cpp @@ -1519,190 +767,23 @@ diff -urN a/src/winmain/winmain.pro b/src/winmain/winmain.pro CONFIG -= jpeg INCLUDEPATH += tmp $$QMAKE_INCDIR_QT/QtCore } - --!win32:error("$$_FILE_ is intended only for Windows!") -+!win32:warning("$$_FILE_ is intended only for Windows! This warning might be a spurious effect of fromfile function.") - include(../qbase.pri) - wince*:QMAKE_POST_LINK = - -diff -urN a/src/xml/xml.pro b/src/xml/xml.pro ---- a/src/xml/xml.pro 2009-11-27 02:27:48.000000000 +0100 -+++ b/src/xml/xml.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -4,7 +4,7 @@ - DEFINES += QT_BUILD_XML_LIB QT_NO_USING_NAMESPACE - win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000 - --unix:QMAKE_PKGCONFIG_REQUIRES = QtCore -+unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore - - include(../qbase.pri) - -diff -urN a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro ---- a/src/xmlpatterns/xmlpatterns.pro 2009-11-27 02:27:53.000000000 +0100 -+++ b/src/xmlpatterns/xmlpatterns.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -4,7 +4,7 @@ - DEFINES += QT_BUILD_XMLPATTERNS_LIB QT_NO_USING_NAMESPACE - win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000 - --unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtNetwork -+unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore QtNetwork - - include(../qbase.pri) - -diff -urN a/tools/assistant/compat/assistant.pro b/tools/assistant/compat/assistant.pro ---- a/tools/assistant/compat/assistant.pro 2009-11-27 02:27:46.000000000 +0100 -+++ b/tools/assistant/compat/assistant.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -6,7 +6,7 @@ - - CONFIG += qt warn_on - --unix:contains(QT_CONFIG, dbus):QT += dbus -+unix:!win32:contains(QT_CONFIG, dbus):QT += dbus - - build_all:!build_pass { - CONFIG -= build_all -@@ -67,7 +67,7 @@ - - TRANSLATIONS = assistant_de.ts - --unix:!contains(QT_CONFIG, zlib):LIBS += -lz -+unix:!win32:!contains(QT_CONFIG, zlib):LIBS += -lz - - contains(CONFIG, static): { - win32 { -diff -urN a/tools/assistant/compat/compat.pro b/tools/assistant/compat/compat.pro ---- a/tools/assistant/compat/compat.pro 2009-11-27 02:27:46.000000000 +0100 -+++ b/tools/assistant/compat/compat.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -6,7 +6,7 @@ - - CONFIG += qt warn_on - --unix:contains(QT_CONFIG, dbus):QT += dbus -+unix:!win32:contains(QT_CONFIG, dbus):QT += dbus - - build_all:!build_pass { - CONFIG -= build_all -@@ -67,7 +67,7 @@ - - TRANSLATIONS = assistant_de.ts - --unix:!contains(QT_CONFIG, zlib):LIBS += -lz -+unix:!win32:!contains(QT_CONFIG, zlib):LIBS += -lz - - contains(CONFIG, static): { - win32 { -diff -urN a/tools/assistant/compat/lib/lib.pro b/tools/assistant/compat/lib/lib.pro ---- a/tools/assistant/compat/lib/lib.pro 2009-11-27 02:27:46.000000000 +0100 -+++ b/tools/assistant/compat/lib/lib.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -19,7 +19,7 @@ - DESTDIR = ../../../../lib - DLLDESTDIR = ../../../../bin - --unix { -+unix:!win32 { - QMAKE_CFLAGS += $$QMAKE_CFLAGS_SHLIB - QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_SHLIB - } -@@ -67,7 +67,7 @@ - INSTALLS += assistant_headers +diff -urN a/tools/qvfb/qvfb.pro b/tools/qvfb/qvfb.pro +--- a/tools/qvfb/qvfb.pro 2009-11-27 02:27:47.000000000 +0100 ++++ b/tools/qvfb/qvfb.pro 2009-12-05 23:36:47.000000000 +0100 +@@ -42,12 +42,14 @@ } --unix { -+unix:!win32 { - CONFIG += create_pc - QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS] - QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/QtAssistant -diff -urN a/tools/assistant/lib/fulltextsearch/fulltextsearch.pro b/tools/assistant/lib/fulltextsearch/fulltextsearch.pro ---- a/tools/assistant/lib/fulltextsearch/fulltextsearch.pro 2009-11-27 02:27:46.000000000 +0100 -+++ b/tools/assistant/lib/fulltextsearch/fulltextsearch.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -23,7 +23,7 @@ - linux*-g++*:DEFINES += _GLIBCXX_EXTERN_TEMPLATE=0 - } - --unix:QMAKE_PKGCONFIG_REQUIRES = QtCore -+unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore - - # impossible to disable exceptions in clucene atm - CONFIG(exceptions_off) { -diff -urN a/tools/assistant/lib/lib.pro b/tools/assistant/lib/lib.pro ---- a/tools/assistant/lib/lib.pro 2009-11-27 02:27:46.000000000 +0100 -+++ b/tools/assistant/lib/lib.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -19,7 +19,7 @@ - win32:qclucene = $${qclucene}d - } - linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene --unix:QMAKE_PKGCONFIG_REQUIRES += QtNetwork \ -+unix:!win32:QMAKE_PKGCONFIG_REQUIRES += QtNetwork \ - QtSql \ - QtXml - LIBS_PRIVATE += -l$$qclucene -diff -urN a/tools/designer/src/components/lib/lib.pro b/tools/designer/src/components/lib/lib.pro ---- a/tools/designer/src/components/lib/lib.pro 2009-11-27 02:27:46.000000000 +0100 -+++ b/tools/designer/src/components/lib/lib.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -64,7 +64,7 @@ - include(../../sharedcomponents.pri) - include(../component.pri) - --unix { -+unix:!win32 { - QMAKE_PKGCONFIG_REQUIRES = QtCore QtDesigner QtGui QtXml - contains(QT_CONFIG, script): QMAKE_PKGCONFIG_REQUIRES += QtScript - } -diff -urN a/tools/designer/src/designer/designer.pro b/tools/designer/src/designer/designer.pro ---- a/tools/designer/src/designer/designer.pro 2009-11-27 02:27:46.000000000 +0100 -+++ b/tools/designer/src/designer/designer.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -89,5 +89,5 @@ - - include(../sharedcomponents.pri) - --unix:!mac:LIBS += -lm -+unix:!win32:!mac:LIBS += -lm - TRANSLATIONS = designer_de.ts -diff -urN a/tools/designer/src/lib/lib.pro b/tools/designer/src/lib/lib.pro ---- a/tools/designer/src/lib/lib.pro 2009-11-27 02:27:46.000000000 +0100 -+++ b/tools/designer/src/lib/lib.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -13,7 +13,7 @@ - VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} - } - --unix:QMAKE_PKGCONFIG_REQUIRES += QtXml -+unix:!win32:QMAKE_PKGCONFIG_REQUIRES += QtXml - - include(../../../../src/qt_targets.pri) - QMAKE_TARGET_PRODUCT = Designer -diff -urN a/tools/designer/src/sharedcomponents.pri b/tools/designer/src/sharedcomponents.pri ---- a/tools/designer/src/sharedcomponents.pri 2009-11-27 02:27:46.000000000 +0100 -+++ b/tools/designer/src/sharedcomponents.pri 2009-12-04 10:30:44.000000000 +0100 -@@ -21,7 +21,7 @@ - } + contains(QT_CONFIG, system-png) { +- LIBS += -lpng ++ unix|win32-g++:LIBS_PRIVATE += -lpng ++ win32:!win32-g++:LIBS += libpng.lib + } else { + INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/libpng } - --unix { -+unix:!win32 { - CONFIG += create_pc - QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS] - QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET -diff -urN a/tools/designer/src/uitools/uitools.pro b/tools/designer/src/uitools/uitools.pro ---- a/tools/designer/src/uitools/uitools.pro 2009-11-27 02:27:46.000000000 +0100 -+++ b/tools/designer/src/uitools/uitools.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -35,7 +35,7 @@ - target.path=$$[QT_INSTALL_LIBS] - INSTALLS += target - --unix { -+unix:!win32 { - CONFIG += create_pc - QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS] - QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET -diff -urN a/tools/tools.pro b/tools/tools.pro ---- a/tools/tools.pro 2009-11-27 02:27:47.000000000 +0100 -+++ b/tools/tools.pro 2009-12-04 10:30:44.000000000 +0100 -@@ -16,7 +16,7 @@ - SUBDIRS += linguist - symbian: SUBDIRS = designer - wince*: SUBDIRS = qtestlib designer -- unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig -+ unix:!win32:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig - win32:!wince*:SUBDIRS += activeqt + contains(QT_CONFIG, system-zlib) { +- LIBS += -lz ++ unix|win32-g++:LIBS_PRIVATE += -lz ++ win32:!win32-g++:LIBS += zdll.lib + } else { + INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib } - @@ -87,12 +87,29 @@ define $(PKG)_BUILD do echo TEMPLATE = subdirs >'$(1)'/src/tools/"$$f"/"$$f".pro; \ done + # Trick the buildsystem into using win32 feature files: + mv '$(1)'/mkspecs/features/unix '$(1)'/mkspecs/features/unix.orig + ln -s win32 '$(1)'/mkspecs/features/unix + # Adjust the mkspec values that contain the TARGET platform prefix. # The patch planted strings HOSTPLATFORMPREFIX and HOSTPLATFORMINCLUDE. $(SED) 's,HOSTPLATFORMPREFIX-,$(TARGET)-,g' -i '$(1)'/mkspecs/win32-g++/qmake.conf $(SED) 's,HOSTPLATFORMINCLUDE,$(PREFIX)/$(TARGET)/include,g' -i '$(1)'/mkspecs/win32-g++/qmake.conf + # Make sure qmake doesn't use compilation paths meant for unix + find '$(1)'/src -name '*.pr[oi]' -exec \ + $(SED) 's,\(^\|[^_/]\)unix,\1linux,g' -i {} \; + + # Make qmake use compilation paths meant for MinGW or Windows in general + find '$(1)'/src -name '*.pr[oi]' -exec \ + $(SED) 's,\(^\|[^_/]\)win32-g++\([^-]\|$$\),\1unix\2,g' -i {} \; + find '$(1)'/src -name '*.pr[oi]' -exec \ + $(SED) 's,\(^\|[^_/]\)win32\([^-]\|$$\),\1unix\2,g' -i {} \; + # Configure Qt for MinGW target + # 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. cd '$(1)' && ./configure \ -opensource \ -confirm-license \ @@ -125,12 +142,12 @@ define $(PKG)_BUILD -plugin-sql-psql \ -plugin-sql-tds \ -system-zlib \ - -qt-gif \ - -system-libtiff \ -system-libpng \ - -qt-libmng \ -system-libjpeg \ + -system-libtiff \ + -system-libmng \ -system-sqlite \ + -qt-gif \ -openssl-linked \ -v @@ -138,12 +155,4 @@ define $(PKG)_BUILD $(TARGET)-ranlib '$(1)'/lib/*.a rm -rf '$(PREFIX)/$(TARGET)/mkspecs' $(MAKE) -C '$(1)' install - # Manually created prl files for static plugins to help applications link to system libs - $(INSTALL) -m664 '$(1)/lib/qjpeg.prl' '$(PREFIX)/$(TARGET)/lib/' -# $(INSTALL) -m664 '$(1)/lib/qmng.prl' '$(PREFIX)/$(TARGET)/lib/' - $(INSTALL) -m664 '$(1)/lib/qsqlite.prl' '$(PREFIX)/$(TARGET)/lib/' - $(INSTALL) -m664 '$(1)/lib/qsqlodbc.prl' '$(PREFIX)/$(TARGET)/lib/' - $(INSTALL) -m664 '$(1)/lib/qsqlpsql.prl' '$(PREFIX)/$(TARGET)/lib/' - $(INSTALL) -m664 '$(1)/lib/qsqltds.prl' '$(PREFIX)/$(TARGET)/lib/' - $(INSTALL) -m664 '$(1)/lib/qtiff.prl' '$(PREFIX)/$(TARGET)/lib/' endef |