Mercurial > mxe-octave

comparison src/qt-win32.patch @ 574:bdd31b51843e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
various improvements for package qt (by Mark Brand)
author Volker Grabsch <vog@notjusthosting.com>
date Fri, 04 Dec 2009 04:36:14 +0100
parents 57166e6490d2
children d262f9cc5821
comparison
equal deleted inserted replaced
573:57166e6490d2 574:bdd31b51843e
21 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 21 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 22 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
23 23
24 diff -urN a/configure b/configure 24 diff -urN a/configure b/configure
25 --- a/configure 2009-11-27 02:27:48.000000000 +0100 25 --- a/configure 2009-11-27 02:27:48.000000000 +0100
26 +++ b/configure 2009-12-02 21:44:56.000000000 +0100 26 +++ b/configure 2009-12-03 16:19:48.000000000 +0100
27 @@ -591,7 +591,7 @@ 27 @@ -591,7 +591,7 @@
28 rm -f "$outpath/config.tests/.qmake.cache" 28 rm -f "$outpath/config.tests/.qmake.cache"
29 cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache" 29 cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
30 30
31 -QMakeVar add styles "cde mac motif plastique cleanlooks windows" 31 -QMakeVar add styles "cde mac motif plastique cleanlooks windows"
374 + *) continue ;; 374 + *) continue ;;
375 + esac ;; 375 + esac ;;
376 *s60main/s60main.pro) continue ;; 376 *s60main/s60main.pro) continue ;;
377 *examples/activeqt/*) continue ;; 377 *examples/activeqt/*) continue ;;
378 */qmake/qmake.pro) continue ;; 378 */qmake/qmake.pro) continue ;;
379 diff -urN a/demos/spreadsheet/spreadsheet.pro b/demos/spreadsheet/spreadsheet.pro
380 --- a/demos/spreadsheet/spreadsheet.pro 2009-11-27 02:27:41.000000000 +0100
381 +++ b/demos/spreadsheet/spreadsheet.pro 2009-12-03 17:47:52.000000000 +0100
382 @@ -8,7 +8,7 @@
383 INCLUDEPATH += .
384
385 CONFIG += qt warn_on
386 -#unix:contains(QT_CONFIG, dbus):QT += dbus
387 +#unix:!win32:contains(QT_CONFIG, dbus):QT += dbus
388
389 # Input
390 HEADERS += printview.h spreadsheet.h spreadsheetdelegate.h spreadsheetitem.h
391 diff -urN a/doc/src/snippets/qmake/scopes.pro b/doc/src/snippets/qmake/scopes.pro
392 --- a/doc/src/snippets/qmake/scopes.pro 2009-11-27 02:27:44.000000000 +0100
393 +++ b/doc/src/snippets/qmake/scopes.pro 2009-12-03 21:21:53.000000000 +0100
394 @@ -17,7 +17,7 @@
395 }
396 #! [1]
397
398 -unix {
399 +unix:!win32 {
400 SOURCES += paintwidget_unix.cpp
401 }
402
403 diff -urN a/doc/src/snippets/qmake/spaces.pro b/doc/src/snippets/qmake/spaces.pro
404 --- a/doc/src/snippets/qmake/spaces.pro 2009-11-27 02:27:44.000000000 +0100
405 +++ b/doc/src/snippets/qmake/spaces.pro 2009-12-03 17:47:52.000000000 +0100
406 @@ -1,9 +1,9 @@
407 #! [quoting library paths with spaces]
408 win32:LIBS += $$quote(C:/mylibs/extra libs/extra.lib)
409 -unix:LIBS += $$quote(-L/home/user/extra libs) -lextra
410 +unix:!win32:LIBS += $$quote(-L/home/user/extra libs) -lextra
411 #! [quoting library paths with spaces]
412
413 #! [quoting include paths with spaces]
414 win32:INCLUDEPATH += $$quote(C:/mylibs/extra headers)
415 -unix:INCLUDEPATH += $$quote(/home/user/extra headers)
416 +unix:!win32:INCLUDEPATH += $$quote(/home/user/extra headers)
417 #! [quoting include paths with spaces]
418 diff -urN a/examples/itemviews/chart/chart.pro b/examples/itemviews/chart/chart.pro
419 --- a/examples/itemviews/chart/chart.pro 2009-11-27 02:27:48.000000000 +0100
420 +++ b/examples/itemviews/chart/chart.pro 2009-12-03 21:07:18.000000000 +0100
421 @@ -4,7 +4,7 @@
422 SOURCES = main.cpp \
423 mainwindow.cpp \
424 pieview.cpp
425 -unix:!mac:!symbian:!vxworks:LIBS+= -lm
426 +unix:!win32:!mac:!symbian:!vxworks:LIBS+= -lm
427
428 TARGET.EPOCHEAPSIZE = 0x200000 0x800000
429
430 diff -urN a/examples/painting/painterpaths/painterpaths.pro b/examples/painting/painterpaths/painterpaths.pro
431 --- a/examples/painting/painterpaths/painterpaths.pro 2009-11-27 02:27:48.000000000 +0100
432 +++ b/examples/painting/painterpaths/painterpaths.pro 2009-12-03 21:07:18.000000000 +0100
433 @@ -3,7 +3,7 @@
434 SOURCES = main.cpp \
435 renderarea.cpp \
436 window.cpp
437 -unix:!mac:!symbian:!vxworks:LIBS += -lm
438 +unix:!win32:!mac:!symbian:!vxworks:LIBS += -lm
439
440 # install
441 target.path = $$[QT_INSTALL_EXAMPLES]/painting/painterpaths
442 diff -urN a/examples/threads/mandelbrot/mandelbrot.pro b/examples/threads/mandelbrot/mandelbrot.pro
443 --- a/examples/threads/mandelbrot/mandelbrot.pro 2009-11-27 02:27:48.000000000 +0100
444 +++ b/examples/threads/mandelbrot/mandelbrot.pro 2009-12-03 21:07:18.000000000 +0100
445 @@ -4,7 +4,7 @@
446 mandelbrotwidget.cpp \
447 renderthread.cpp
448
449 -unix:!mac:!symbian:!vxworks:LIBS += -lm
450 +unix:!win32:!mac:!symbian:!vxworks:LIBS += -lm
451
452 # install
453 target.path = $$[QT_INSTALL_EXAMPLES]/threads/mandelbrot
454 diff -urN a/lib/qjpeg.prl b/lib/qjpeg.prl
455 --- a/lib/qjpeg.prl 1970-01-01 01:00:00.000000000 +0100
456 +++ b/lib/qjpeg.prl 2009-12-03 16:19:48.000000000 +0100
457 @@ -0,0 +1 @@
458 +QMAKE_PRL_LIBS = -ljpeg
459 diff -urN a/lib/qmng.prl b/lib/qmng.prl
460 --- a/lib/qmng.prl 1970-01-01 01:00:00.000000000 +0100
461 +++ b/lib/qmng.prl 2009-12-03 16:19:48.000000000 +0100
462 @@ -0,0 +1 @@
463 +QMAKE_PRL_LIBS = -lmng
464 diff -urN a/lib/qsqlite.prl b/lib/qsqlite.prl
465 --- a/lib/qsqlite.prl 1970-01-01 01:00:00.000000000 +0100
466 +++ b/lib/qsqlite.prl 2009-12-03 16:19:48.000000000 +0100
467 @@ -0,0 +1 @@
468 +QMAKE_PRL_LIBS = -lsqlite3
469 diff -urN a/lib/qsqlodbc.prl b/lib/qsqlodbc.prl
470 --- a/lib/qsqlodbc.prl 1970-01-01 01:00:00.000000000 +0100
471 +++ b/lib/qsqlodbc.prl 2009-12-03 16:19:48.000000000 +0100
472 @@ -0,0 +1 @@
473 +QMAKE_PRL_LIBS = -lodbc32
474 diff -urN a/lib/qsqlpsql.prl b/lib/qsqlpsql.prl
475 --- a/lib/qsqlpsql.prl 1970-01-01 01:00:00.000000000 +0100
476 +++ b/lib/qsqlpsql.prl 2009-12-03 16:19:48.000000000 +0100
477 @@ -0,0 +1 @@
478 +QMAKE_PRL_LIBS = -lpq
479 diff -urN a/lib/qsqltds.prl b/lib/qsqltds.prl
480 --- a/lib/qsqltds.prl 1970-01-01 01:00:00.000000000 +0100
481 +++ b/lib/qsqltds.prl 2009-12-03 16:19:48.000000000 +0100
482 @@ -0,0 +1 @@
483 +QMAKE_PRL_LIBS = -lsybdb -liconv
484 diff -urN a/lib/qtiff.prl b/lib/qtiff.prl
485 --- a/lib/qtiff.prl 1970-01-01 01:00:00.000000000 +0100
486 +++ b/lib/qtiff.prl 2009-12-03 16:19:48.000000000 +0100
487 @@ -0,0 +1 @@
488 +QMAKE_PRL_LIBS = -ltiff
379 diff -urN a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf 489 diff -urN a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
380 --- a/mkspecs/win32-g++/qmake.conf 2009-11-27 02:27:45.000000000 +0100 490 --- a/mkspecs/win32-g++/qmake.conf 2009-11-27 02:27:45.000000000 +0100
381 +++ b/mkspecs/win32-g++/qmake.conf 2009-12-02 20:54:42.000000000 +0100 491 +++ b/mkspecs/win32-g++/qmake.conf 2009-12-03 16:19:48.000000000 +0100
382 @@ -3,23 +3,31 @@ 492 @@ -3,23 +3,31 @@
383 # 493 #
384 # Written for MinGW 494 # Written for MinGW
385 # 495 #
386 +load(qt_config) 496 +load(qt_config)
485 -QMAKE_STRIP = strip 595 -QMAKE_STRIP = strip
486 +QMAKE_STRIP = HOSTPLATFORMPREFIX-strip 596 +QMAKE_STRIP = HOSTPLATFORMPREFIX-strip
487 QMAKE_STRIPFLAGS_LIB += --strip-unneeded 597 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
488 -load(qt_config) 598 -load(qt_config)
489 +PKG_CONFIG = HOSTPLATFORMPREFIX-pkg-config 599 +PKG_CONFIG = HOSTPLATFORMPREFIX-pkg-config
600 diff -urN a/projects.pro b/projects.pro
601 --- a/projects.pro 2009-11-27 02:27:45.000000000 +0100
602 +++ b/projects.pro 2009-12-03 21:26:24.000000000 +0100
603 @@ -55,7 +55,7 @@
604
605 !symbian: confclean.depends += clean
606 confclean.commands =
607 -unix:!symbian {
608 +unix:!win32:!symbian {
609 confclean.commands += (cd config.tests/unix/stl && $(MAKE) distclean); \
610 (cd config.tests/unix/endian && $(MAKE) distclean); \
611 (cd config.tests/unix/ipv6 && $(MAKE) distclean); \
612 diff -urN a/qmake/qmake.pri b/qmake/qmake.pri
613 --- a/qmake/qmake.pri 2009-11-27 02:27:48.000000000 +0100
614 +++ b/qmake/qmake.pri 2009-12-03 21:26:24.000000000 +0100
615 @@ -117,7 +117,7 @@
616 qxmlstream.h \
617 qxmlutils.h
618
619 - unix {
620 + unix:!win32 {
621 SOURCES += qfsfileengine_unix.cpp qfsfileengine_iterator_unix.cpp
622 mac {
623 SOURCES += qcore_mac.cpp qsettings_mac.cpp
624 diff -urN a/src/3rdparty/javascriptcore/WebKit.pri b/src/3rdparty/javascriptcore/WebKit.pri
625 --- a/src/3rdparty/javascriptcore/WebKit.pri 2009-11-27 02:27:50.000000000 +0100
626 +++ b/src/3rdparty/javascriptcore/WebKit.pri 2009-12-03 21:32:03.000000000 +0100
627 @@ -31,7 +31,7 @@
628 DEPENDPATH += $$PWD/WebKit/qt/Api
629 }
630
631 -!mac:!unix|symbian {
632 +!mac:!unix|win32|symbian {
633 DEFINES += USE_SYSTEM_MALLOC
634 }
635
636 diff -urN a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
637 --- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro 2009-11-27 02:27:48.000000000 +0100
638 +++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro 2009-12-03 17:47:51.000000000 +0100
639 @@ -34,7 +34,7 @@
640
641 CONFIG(release):!CONFIG(QTDIR_build) {
642 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
643 - unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
644 + unix:!win32:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
645 }
646
647 linux-*: DEFINES += HAVE_STDINT_H
648 diff -urN a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
649 --- a/src/3rdparty/webkit/WebCore/WebCore.pro 2009-11-27 02:27:50.000000000 +0100
650 +++ b/src/3rdparty/webkit/WebCore/WebCore.pro 2009-12-03 21:22:34.000000000 +0100
651 @@ -50,12 +50,12 @@
652 lessThan(QT_MINOR_VERSION, 4): QMAKE_PKGCONFIG_REQUIRES += QtXml
653 }
654
655 -unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
656 -unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
657 +unix:!win32:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
658 +unix:!win32:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
659
660 CONFIG(release):!CONFIG(QTDIR_build) {
661 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
662 - unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
663 + unix:!win32:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
664 }
665
666 linux-*: DEFINES += HAVE_STDINT_H
667 @@ -2477,7 +2477,7 @@
668
669 } else {
670
671 - unix {
672 + unix:!win32 {
673
674 mac {
675 SOURCES += \
676 diff -urN a/src/corelib/arch/generic/arch.pri b/src/corelib/arch/generic/arch.pri
677 --- a/src/corelib/arch/generic/arch.pri 2009-11-27 02:27:54.000000000 +0100
678 +++ b/src/corelib/arch/generic/arch.pri 2009-12-03 22:26:05.000000000 +0100
679 @@ -2,5 +2,5 @@
680 # 'generic' architecture
681 #
682
683 -unix:SOURCES += qatomic_generic_unix.cpp
684 +unix:!win32:SOURCES += qatomic_generic_unix.cpp
685 win32:SOURCES += qatomic_generic_windows.cpp
686 diff -urN a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri
687 --- a/src/corelib/codecs/codecs.pri 2009-11-27 02:27:53.000000000 +0100
688 +++ b/src/corelib/codecs/codecs.pri 2009-12-03 21:17:25.000000000 +0100
689 @@ -19,7 +19,7 @@
690 codecs/qutfcodec.cpp \
691 codecs/qtextcodecplugin.cpp
692
693 -unix {
694 +unix:!win32 {
695 SOURCES += codecs/qfontlaocodec.cpp
696
697 contains(QT_CONFIG,iconv) {
698 diff -urN a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri
699 --- a/src/corelib/kernel/kernel.pri 2009-11-27 02:27:54.000000000 +0100
700 +++ b/src/corelib/kernel/kernel.pri 2009-12-03 21:57:49.000000000 +0100
701 @@ -89,7 +89,7 @@
702 kernel/qcore_mac.cpp
703 }
704
705 -unix:!symbian {
706 +unix:!win32:!symbian {
707 SOURCES += \
708 kernel/qcore_unix.cpp \
709 kernel/qcrashhandler.cpp \
710 diff -urN a/src/corelib/plugin/plugin.pri b/src/corelib/plugin/plugin.pri
711 --- a/src/corelib/plugin/plugin.pri 2009-11-27 02:27:54.000000000 +0100
712 +++ b/src/corelib/plugin/plugin.pri 2009-12-03 21:26:24.000000000 +0100
713 @@ -19,7 +19,7 @@
714 SOURCES += plugin/qlibrary_win.cpp
715 }
716
717 -unix {
718 +unix:!win32 {
719 SOURCES += plugin/qlibrary_unix.cpp
720 }
721
722 diff -urN a/src/corelib/thread/thread.pri b/src/corelib/thread/thread.pri
723 --- a/src/corelib/thread/thread.pri 2009-11-27 02:27:54.000000000 +0100
724 +++ b/src/corelib/thread/thread.pri 2009-12-03 22:24:09.000000000 +0100
725 @@ -24,7 +24,7 @@
726 thread/qthread.cpp \
727 thread/qthreadstorage.cpp
728
729 -unix:SOURCES += thread/qmutex_unix.cpp \
730 +unix:!win32:SOURCES += thread/qmutex_unix.cpp \
731 thread/qthread_unix.cpp \
732 thread/qwaitcondition_unix.cpp
733
490 diff -urN a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri 734 diff -urN a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
491 --- a/src/corelib/tools/tools.pri 2009-11-27 02:27:54.000000000 +0100 735 --- a/src/corelib/tools/tools.pri 2009-11-27 02:27:54.000000000 +0100
492 +++ b/src/corelib/tools/tools.pri 2009-12-02 20:55:47.000000000 +0100 736 +++ b/src/corelib/tools/tools.pri 2009-12-03 22:30:28.000000000 +0100
493 @@ -96,8 +96,8 @@ 737 @@ -96,8 +96,8 @@
494 ../3rdparty/zlib/uncompr.c \ 738 ../3rdparty/zlib/uncompr.c \
495 ../3rdparty/zlib/zutil.c 739 ../3rdparty/zlib/zutil.c
496 } else:!contains(QT_CONFIG, no-zlib) { 740 } else:!contains(QT_CONFIG, no-zlib) {
497 - unix:LIBS_PRIVATE += -lz 741 - unix:LIBS_PRIVATE += -lz
499 + unix|win32-g++:LIBS_PRIVATE += -lz 743 + unix|win32-g++:LIBS_PRIVATE += -lz
500 + win32-msvc*|win32-icc:LIBS += zdll.lib 744 + win32-msvc*|win32-icc:LIBS += zdll.lib
501 } 745 }
502 746
503 DEFINES += HB_EXPORT=Q_CORE_EXPORT 747 DEFINES += HB_EXPORT=Q_CORE_EXPORT
748 @@ -118,5 +118,5 @@
749 ../3rdparty/md4
750
751 # Note: libm should be present by default becaue this is C++
752 -!macx-icc:!vxworks:!symbian:unix:LIBS_PRIVATE += -lm
753 +!macx-icc:!vxworks:!symbian:!win32:unix:LIBS_PRIVATE += -lm
754
755 diff -urN a/src/gui/dialogs/dialogs.pri b/src/gui/dialogs/dialogs.pri
756 --- a/src/gui/dialogs/dialogs.pri 2009-11-27 02:27:52.000000000 +0100
757 +++ b/src/gui/dialogs/dialogs.pri 2009-12-03 21:26:24.000000000 +0100
758 @@ -46,7 +46,7 @@
759 !win32-borland:!wince*: LIBS += -lshell32 # the filedialog needs this library
760 }
761
762 -!mac:!embedded:!symbian:unix {
763 +!mac:!embedded:!symbian:!win32:unix {
764 HEADERS += dialogs/qpagesetupdialog_unix_p.h
765 SOURCES += dialogs/qprintdialog_unix.cpp \
766 dialogs/qpagesetupdialog_unix.cpp
767 diff -urN a/src/gui/egl/egl.pri b/src/gui/egl/egl.pri
768 --- a/src/gui/egl/egl.pri 2009-11-27 02:27:53.000000000 +0100
769 +++ b/src/gui/egl/egl.pri 2009-12-03 21:26:24.000000000 +0100
770 @@ -10,7 +10,7 @@
771
772 wince*: SOURCES += egl/qegl_wince.cpp
773
774 -unix {
775 +unix:!win32 {
776 embedded {
777 SOURCES += egl/qegl_qws.cpp
778 } else {
504 diff -urN a/src/gui/image/image.pri b/src/gui/image/image.pri 779 diff -urN a/src/gui/image/image.pri b/src/gui/image/image.pri
505 --- a/src/gui/image/image.pri 2009-11-27 02:27:52.000000000 +0100 780 --- a/src/gui/image/image.pri 2009-11-27 02:27:52.000000000 +0100
506 +++ b/src/gui/image/image.pri 2009-12-02 21:06:46.000000000 +0100 781 +++ b/src/gui/image/image.pri 2009-12-03 16:19:48.000000000 +0100
507 @@ -93,11 +93,11 @@ 782 @@ -93,11 +93,11 @@
508 SOURCES += image/qpnghandler.cpp 783 SOURCES += image/qpnghandler.cpp
509 784
510 contains(QT_CONFIG, system-png) { 785 contains(QT_CONFIG, system-png) {
511 - unix:LIBS_PRIVATE += -lpng 786 - unix:LIBS_PRIVATE += -lpng
534 } 809 }
535 } else { 810 } else {
536 DEFINES *= QT_NO_IMAGEFORMAT_PNG 811 DEFINES *= QT_NO_IMAGEFORMAT_PNG
537 diff -urN a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri 812 diff -urN a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
538 --- a/src/gui/painting/painting.pri 2009-11-27 02:27:53.000000000 +0100 813 --- a/src/gui/painting/painting.pri 2009-11-27 02:27:53.000000000 +0100
539 +++ b/src/gui/painting/painting.pri 2009-12-02 20:55:47.000000000 +0100 814 +++ b/src/gui/painting/painting.pri 2009-12-03 22:00:03.000000000 +0100
815 @@ -153,7 +153,7 @@
816 painting/qprintengine_mac.mm \
817 }
818
819 -unix:!mac:!symbian {
820 +unix:!win32:!mac:!symbian {
821 HEADERS += \
822 painting/qprinterinfo_unix_p.h
823 SOURCES += \
540 @@ -380,9 +380,9 @@ 824 @@ -380,9 +380,9 @@
541 } 825 }
542 826
543 contains(QT_CONFIG, zlib) { 827 contains(QT_CONFIG, zlib) {
544 - INCLUDEPATH += ../3rdparty/zlib 828 - INCLUDEPATH += ../3rdparty/zlib
550 + win32-msvc*|win32-icc:LIBS += zdll.lib 834 + win32-msvc*|win32-icc:LIBS += zdll.lib
551 } 835 }
552 836
553 diff -urN a/src/network/access/access.pri b/src/network/access/access.pri 837 diff -urN a/src/network/access/access.pri b/src/network/access/access.pri
554 --- a/src/network/access/access.pri 2009-11-27 02:27:53.000000000 +0100 838 --- a/src/network/access/access.pri 2009-11-27 02:27:53.000000000 +0100
555 +++ b/src/network/access/access.pri 2009-12-02 20:55:47.000000000 +0100 839 +++ b/src/network/access/access.pri 2009-12-03 16:19:48.000000000 +0100
556 @@ -57,8 +57,8 @@ 840 @@ -57,8 +57,8 @@
557 841
558 #zlib support 842 #zlib support
559 contains(QT_CONFIG, zlib) { 843 contains(QT_CONFIG, zlib) {
560 - INCLUDEPATH += ../3rdparty/zlib 844 - INCLUDEPATH += ../3rdparty/zlib
563 - unix:LIBS_PRIVATE += -lz 847 - unix:LIBS_PRIVATE += -lz
564 -# win32:LIBS += libz.lib 848 -# win32:LIBS += libz.lib
565 + unix|win32-g++:LIBS_PRIVATE += -lz 849 + unix|win32-g++:LIBS_PRIVATE += -lz
566 + win32-msvc*|win32-icc:LIBS += zdll.lib 850 + win32-msvc*|win32-icc:LIBS += zdll.lib
567 } 851 }
852 diff -urN a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri
853 --- a/src/network/kernel/kernel.pri 2009-11-27 02:27:53.000000000 +0100
854 +++ b/src/network/kernel/kernel.pri 2009-12-03 22:31:14.000000000 +0100
855 @@ -21,7 +21,7 @@
856 kernel/qnetworkinterface.cpp
857
858 symbian: SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_symbian.cpp
859 -unix:!symbian:SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp
860 +unix:!win32:!symbian:SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp
861 win32:SOURCES += kernel/qhostinfo_win.cpp kernel/qnetworkinterface_win.cpp
862
863 mac:LIBS_PRIVATE += -framework SystemConfiguration -framework CoreFoundation
864 diff -urN a/src/network/socket/socket.pri b/src/network/socket/socket.pri
865 --- a/src/network/socket/socket.pri 2009-11-27 02:27:53.000000000 +0100
866 +++ b/src/network/socket/socket.pri 2009-12-03 22:26:55.000000000 +0100
867 @@ -25,10 +25,10 @@
868 socket/qlocalsocket.cpp \
869 socket/qlocalserver.cpp
870
871 -unix:SOURCES += socket/qnativesocketengine_unix.cpp \
872 +unix:!win32:SOURCES += socket/qnativesocketengine_unix.cpp \
873 socket/qlocalsocket_unix.cpp \
874 socket/qlocalserver_unix.cpp
875 -unix:HEADERS += \
876 +unix:!win32:HEADERS += \
877 socket/qnet_unix_p.h
878
879 win32:SOURCES += socket/qnativesocketengine_win.cpp \
880 diff -urN a/src/plugins/codecs/jp/jp.pro b/src/plugins/codecs/jp/jp.pro
881 --- a/src/plugins/codecs/jp/jp.pro 2009-11-27 02:27:53.000000000 +0100
882 +++ b/src/plugins/codecs/jp/jp.pro 2009-12-03 21:26:24.000000000 +0100
883 @@ -16,7 +16,7 @@
884 qjpunicode.cpp \
885 main.cpp
886
887 -unix {
888 +unix:!win32 {
889 HEADERS += qfontjpcodec.h
890 SOURCES += qfontjpcodec.cpp
891 }
568 diff -urN a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro 892 diff -urN a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro
569 --- a/src/plugins/imageformats/jpeg/jpeg.pro 2009-11-27 02:27:53.000000000 +0100 893 --- a/src/plugins/imageformats/jpeg/jpeg.pro 2009-11-27 02:27:53.000000000 +0100
570 +++ b/src/plugins/imageformats/jpeg/jpeg.pro 2009-12-02 21:09:03.000000000 +0100 894 +++ b/src/plugins/imageformats/jpeg/jpeg.pro 2009-12-03 17:47:51.000000000 +0100
571 @@ -20,8 +20,8 @@ 895 @@ -20,8 +20,8 @@
572 } 896 }
573 897
574 contains(QT_CONFIG, system-jpeg) { 898 contains(QT_CONFIG, system-jpeg) {
575 - unix:LIBS += -ljpeg 899 - unix:LIBS += -ljpeg
579 } 903 }
580 !contains(QT_CONFIG, system-jpeg) { 904 !contains(QT_CONFIG, system-jpeg) {
581 INCLUDEPATH += ../../../3rdparty/libjpeg 905 INCLUDEPATH += ../../../3rdparty/libjpeg
582 diff -urN a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro 906 diff -urN a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro
583 --- a/src/plugins/imageformats/mng/mng.pro 2009-11-27 02:27:53.000000000 +0100 907 --- a/src/plugins/imageformats/mng/mng.pro 2009-11-27 02:27:53.000000000 +0100
584 +++ b/src/plugins/imageformats/mng/mng.pro 2009-12-02 21:11:03.000000000 +0100 908 +++ b/src/plugins/imageformats/mng/mng.pro 2009-12-03 17:47:51.000000000 +0100
585 @@ -14,10 +14,9 @@ 909 @@ -14,10 +14,9 @@
586 } 910 }
587 911
588 contains(QT_CONFIG, system-mng) { 912 contains(QT_CONFIG, system-mng) {
589 - unix:LIBS += -lmng 913 - unix:LIBS += -lmng
611 } 935 }
612 936
613 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats 937 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats
614 diff -urN a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro 938 diff -urN a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
615 --- a/src/plugins/imageformats/tiff/tiff.pro 2009-11-27 02:27:53.000000000 +0100 939 --- a/src/plugins/imageformats/tiff/tiff.pro 2009-11-27 02:27:53.000000000 +0100
616 +++ b/src/plugins/imageformats/tiff/tiff.pro 2009-12-02 21:12:12.000000000 +0100 940 +++ b/src/plugins/imageformats/tiff/tiff.pro 2009-12-03 17:47:51.000000000 +0100
617 @@ -8,10 +8,9 @@ 941 @@ -8,10 +8,9 @@
618 qtiffhandler.cpp 942 qtiffhandler.cpp
619 943
620 contains(QT_CONFIG, system-tiff) { 944 contains(QT_CONFIG, system-tiff) {
621 - unix:LIBS += -ltiff 945 - unix:LIBS += -ltiff
626 + win32-msvc*|win32-icc:LIBS += libtiff.lib 950 + win32-msvc*|win32-icc:LIBS += libtiff.lib
627 +} else { 951 +} else {
628 INCLUDEPATH += ../../../3rdparty/libtiff/libtiff 952 INCLUDEPATH += ../../../3rdparty/libtiff/libtiff
629 SOURCES += \ 953 SOURCES += \
630 ../../../3rdparty/libtiff/libtiff/tif_aux.c \ 954 ../../../3rdparty/libtiff/libtiff/tif_aux.c \
955 @@ -50,7 +49,7 @@
956 win32 {
957 SOURCES += ../../../3rdparty/libtiff/libtiff/tif_win32.c
958 }
959 - unix: {
960 + unix:!win32: {
961 SOURCES += ../../../3rdparty/libtiff/libtiff/tif_unix.c
962 }
963 wince*: {
631 @@ -62,10 +61,10 @@ 964 @@ -62,10 +61,10 @@
632 } 965 }
633 966
634 contains(QT_CONFIG, system-zlib) { 967 contains(QT_CONFIG, system-zlib) {
635 - LIBS += -lz 968 - LIBS += -lz
641 +} else { 974 +} else {
642 + INCLUDEPATH += ../../../3rdparty/zlib 975 + INCLUDEPATH += ../../../3rdparty/zlib
643 } 976 }
644 977
645 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats 978 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats
979 diff -urN a/src/plugins/phonon/phonon.pro b/src/plugins/phonon/phonon.pro
980 --- a/src/plugins/phonon/phonon.pro 2009-11-27 02:27:53.000000000 +0100
981 +++ b/src/plugins/phonon/phonon.pro 2009-12-03 17:47:51.000000000 +0100
982 @@ -2,7 +2,7 @@
983
984 SUBDIRS =
985
986 -unix:contains(QT_CONFIG, gstreamer): SUBDIRS *= gstreamer
987 +unix:!win32:contains(QT_CONFIG, gstreamer): SUBDIRS *= gstreamer
988 mac:contains(QT_CONFIG, phonon-backend): SUBDIRS *= qt7
989 win32:!wince*:contains(QT_CONFIG, phonon-backend): SUBDIRS *= ds9
990 wince*:contains(QT_CONFIG, phonon-backend): SUBDIRS *= waveout
991 diff -urN a/src/plugins/plugins.pro b/src/plugins/plugins.pro
992 --- a/src/plugins/plugins.pro 2009-11-27 02:27:53.000000000 +0100
993 +++ b/src/plugins/plugins.pro 2009-12-03 17:47:51.000000000 +0100
994 @@ -1,7 +1,7 @@
995 TEMPLATE = subdirs
996
997 SUBDIRS *= accessible imageformats sqldrivers iconengines script
998 -unix:!symbian {
999 +unix:!win32:!symbian {
1000 contains(QT_CONFIG,iconv)|contains(QT_CONFIG,gnu-libiconv):SUBDIRS *= codecs
1001 } else {
1002 SUBDIRS *= codecs
1003 diff -urN a/src/plugins/sqldrivers/db2/db2.pro b/src/plugins/sqldrivers/db2/db2.pro
1004 --- a/src/plugins/sqldrivers/db2/db2.pro 2009-11-27 02:27:53.000000000 +0100
1005 +++ b/src/plugins/sqldrivers/db2/db2.pro 2009-12-03 17:47:51.000000000 +0100
1006 @@ -4,7 +4,7 @@
1007 SOURCES = main.cpp \
1008 ../../../sql/drivers/db2/qsql_db2.cpp
1009
1010 -unix:!contains( LIBS, .*db2.* ):LIBS *= -ldb2
1011 +unix:!win32:!contains( LIBS, .*db2.* ):LIBS *= -ldb2
1012 win32:!contains( LIBS, .*db2.* ):LIBS *= -ldb2cli
1013
1014 include(../qsqldriverbase.pri)
1015 diff -urN a/src/plugins/sqldrivers/ibase/ibase.pro b/src/plugins/sqldrivers/ibase/ibase.pro
1016 --- a/src/plugins/sqldrivers/ibase/ibase.pro 2009-11-27 02:27:53.000000000 +0100
1017 +++ b/src/plugins/sqldrivers/ibase/ibase.pro 2009-12-03 22:35:24.000000000 +0100
1018 @@ -4,9 +4,9 @@
1019 SOURCES = main.cpp \
1020 ../../../sql/drivers/ibase/qsql_ibase.cpp
1021
1022 -unix:!contains( LIBS, .*gds.* ):!contains( LIBS, .*libfb.* ):LIBS *= -lgds
1023 +unix:!win32:!contains( LIBS, .*gds.* ):!contains( LIBS, .*libfb.* ):LIBS *= -lgds
1024
1025 -win32:!contains( LIBS, .*gds.* ):!contains( LIBS, .*fbclient.* ) {
1026 +!unix:win32:!contains( LIBS, .*gds.* ):!contains( LIBS, .*fbclient.* ) {
1027 !win32-borland:LIBS *= -lgds32_ms
1028 win32-borland:LIBS += gds32.lib
1029 }
1030 diff -urN a/src/plugins/sqldrivers/mysql/mysql.pro b/src/plugins/sqldrivers/mysql/mysql.pro
1031 --- a/src/plugins/sqldrivers/mysql/mysql.pro 2009-11-27 02:27:53.000000000 +0100
1032 +++ b/src/plugins/sqldrivers/mysql/mysql.pro 2009-12-03 17:47:51.000000000 +0100
1033 @@ -4,7 +4,7 @@
1034 SOURCES = main.cpp \
1035 ../../../sql/drivers/mysql/qsql_mysql.cpp
1036
1037 -unix: {
1038 +unix:!win32: {
1039 isEmpty(QT_LFLAGS_MYSQL) {
1040 !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) {
1041 use_libmysqlclient_r:LIBS *= -lmysqlclient_r
1042 diff -urN a/src/plugins/sqldrivers/oci/oci.pro b/src/plugins/sqldrivers/oci/oci.pro
1043 --- a/src/plugins/sqldrivers/oci/oci.pro 2009-11-27 02:27:53.000000000 +0100
1044 +++ b/src/plugins/sqldrivers/oci/oci.pro 2009-12-03 17:47:51.000000000 +0100
1045 @@ -6,7 +6,7 @@
1046
1047 win32:LIBS *= -loci
1048
1049 -unix:!contains( LIBS, .*clnts.* ):LIBS *= -lclntsh
1050 +unix:!win32:!contains( LIBS, .*clnts.* ):LIBS *= -lclntsh
1051
1052 macx:QMAKE_LFLAGS += -Wl,-flat_namespace,-U,_environ
1053
1054 diff -urN a/src/plugins/sqldrivers/odbc/odbc.pro b/src/plugins/sqldrivers/odbc/odbc.pro
1055 --- a/src/plugins/sqldrivers/odbc/odbc.pro 2009-11-27 02:27:53.000000000 +0100
1056 +++ b/src/plugins/sqldrivers/odbc/odbc.pro 2009-12-03 21:24:22.000000000 +0100
1057 @@ -4,7 +4,7 @@
1058 SOURCES = main.cpp \
1059 ../../../sql/drivers/odbc/qsql_odbc.cpp
1060
1061 -unix {
1062 +unix:!win32 {
1063 !contains( LIBS, .*odbc.* ) {
1064 LIBS *= $$QT_LFLAGS_ODBC
1065 }
1066 diff -urN a/src/plugins/sqldrivers/psql/psql.pro b/src/plugins/sqldrivers/psql/psql.pro
1067 --- a/src/plugins/sqldrivers/psql/psql.pro 2009-11-27 02:27:53.000000000 +0100
1068 +++ b/src/plugins/sqldrivers/psql/psql.pro 2009-12-03 17:47:51.000000000 +0100
1069 @@ -4,7 +4,7 @@
1070 SOURCES = main.cpp \
1071 ../../../sql/drivers/psql/qsql_psql.cpp
1072
1073 -unix: {
1074 +unix:!win32: {
1075 !isEmpty(QT_LFLAGS_PSQL) {
1076 LIBS *= $$QT_LFLAGS_PSQL
1077 QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL
646 diff -urN a/src/plugins/sqldrivers/tds/main.cpp b/src/plugins/sqldrivers/tds/main.cpp 1078 diff -urN a/src/plugins/sqldrivers/tds/main.cpp b/src/plugins/sqldrivers/tds/main.cpp
647 --- a/src/plugins/sqldrivers/tds/main.cpp 2009-11-27 02:27:53.000000000 +0100 1079 --- a/src/plugins/sqldrivers/tds/main.cpp 2009-11-27 02:27:53.000000000 +0100
648 +++ b/src/plugins/sqldrivers/tds/main.cpp 2009-12-02 20:54:42.000000000 +0100 1080 +++ b/src/plugins/sqldrivers/tds/main.cpp 2009-12-03 16:19:48.000000000 +0100
649 @@ -47,6 +47,7 @@ 1081 @@ -47,6 +47,7 @@
650 #define _WINSCARD_H_ 1082 #define _WINSCARD_H_
651 #include <windows.h> 1083 #include <windows.h>
652 #endif 1084 #endif
653 +#define Q_USE_SYBASE 1085 +#define Q_USE_SYBASE
654 #include "../../../sql/drivers/tds/qsql_tds.h" 1086 #include "../../../sql/drivers/tds/qsql_tds.h"
655 1087
656 QT_BEGIN_NAMESPACE 1088 QT_BEGIN_NAMESPACE
657 diff -urN a/src/plugins/sqldrivers/tds/tds.pro b/src/plugins/sqldrivers/tds/tds.pro 1089 diff -urN a/src/plugins/sqldrivers/tds/tds.pro b/src/plugins/sqldrivers/tds/tds.pro
658 --- a/src/plugins/sqldrivers/tds/tds.pro 2009-11-27 02:27:53.000000000 +0100 1090 --- a/src/plugins/sqldrivers/tds/tds.pro 2009-11-27 02:27:53.000000000 +0100
659 +++ b/src/plugins/sqldrivers/tds/tds.pro 2009-12-02 20:54:42.000000000 +0100 1091 +++ b/src/plugins/sqldrivers/tds/tds.pro 2009-12-03 17:47:51.000000000 +0100
660 @@ -5,11 +5,6 @@ 1092 @@ -5,11 +5,6 @@
661 SOURCES = main.cpp \ 1093 SOURCES = main.cpp \
662 ../../../sql/drivers/tds/qsql_tds.cpp 1094 ../../../sql/drivers/tds/qsql_tds.cpp
663 1095
664 -unix:!contains( LIBS, .*sybdb.* ):LIBS *= -lsybdb 1096 -unix:!contains( LIBS, .*sybdb.* ):LIBS *= -lsybdb
671 +#Patched to use FreeTDS targetting MinGW 1103 +#Patched to use FreeTDS targetting MinGW
672 +LIBS *= -lsybdb -liconv -lws2_32 1104 +LIBS *= -lsybdb -liconv -lws2_32
673 include(../qsqldriverbase.pri) 1105 include(../qsqldriverbase.pri)
674 diff -urN a/src/qbase.pri b/src/qbase.pri 1106 diff -urN a/src/qbase.pri b/src/qbase.pri
675 --- a/src/qbase.pri 2009-11-27 02:27:54.000000000 +0100 1107 --- a/src/qbase.pri 2009-11-27 02:27:54.000000000 +0100
676 +++ b/src/qbase.pri 2009-12-02 20:55:47.000000000 +0100 1108 +++ b/src/qbase.pri 2009-12-03 22:29:08.000000000 +0100
1109 @@ -39,7 +39,7 @@
1110 linux-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
1111
1112 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
1113 -unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
1114 +unix:!win32:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
1115 contains(QT_CONFIG, largefile):CONFIG += largefile
1116
1117 #mac frameworks
677 @@ -85,7 +85,6 @@ 1118 @@ -85,7 +85,6 @@
678 } 1119 }
679 1120
680 win32 { 1121 win32 {
681 - CONFIG += zlib 1122 - CONFIG += zlib
682 INCLUDEPATH += tmp 1123 INCLUDEPATH += tmp
683 !static: DEFINES+=QT_MAKEDLL 1124 !static: DEFINES+=QT_MAKEDLL
684 } 1125 }
1126 diff -urN a/src/qt3support/network/network.pri b/src/qt3support/network/network.pri
1127 --- a/src/qt3support/network/network.pri 2009-11-27 02:27:54.000000000 +0100
1128 +++ b/src/qt3support/network/network.pri 2009-12-03 22:26:12.000000000 +0100
1129 @@ -25,6 +25,6 @@
1130 network/q3urloperator.cpp
1131
1132 win32:SOURCES += network/q3socketdevice_win.cpp
1133 -unix:SOURCES += network/q3socketdevice_unix.cpp
1134 +unix:!win32:SOURCES += network/q3socketdevice_unix.cpp
1135 mac:LIBS_PRIVATE += -lresolv
1136
1137 diff -urN a/src/qt3support/other/other.pri b/src/qt3support/other/other.pri
1138 --- a/src/qt3support/other/other.pri 2009-11-27 02:27:54.000000000 +0100
1139 +++ b/src/qt3support/other/other.pri 2009-12-03 22:26:12.000000000 +0100
1140 @@ -18,7 +18,7 @@
1141 other/q3process.cpp \
1142 other/q3membuf.cpp
1143
1144 -unix:SOURCES += other/q3process_unix.cpp
1145 +unix:!win32:SOURCES += other/q3process_unix.cpp
1146 win32:SOURCES+= other/q3process_win.cpp
1147
1148
1149 diff -urN a/src/sql/drivers/drivers.pri b/src/sql/drivers/drivers.pri
1150 --- a/src/sql/drivers/drivers.pri 2009-11-27 02:27:52.000000000 +0100
1151 +++ b/src/sql/drivers/drivers.pri 2009-12-03 22:34:47.000000000 +0100
1152 @@ -6,7 +6,7 @@
1153 HEADERS += drivers/psql/qsql_psql.h
1154 SOURCES += drivers/psql/qsql_psql.cpp
1155
1156 - unix {
1157 + unix:!win32 {
1158 !isEmpty(QT_LFLAGS_PSQL) {
1159 LIBS *= $$QT_LFLAGS_PSQL
1160 QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL
1161 @@ -25,7 +25,7 @@
1162 HEADERS += drivers/mysql/qsql_mysql.h
1163 SOURCES += drivers/mysql/qsql_mysql.cpp
1164
1165 - unix {
1166 + unix:!win32 {
1167 isEmpty(QT_LFLAGS_MYSQL) {
1168 !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) {
1169 use_libmysqlclient_r:LIBS *= -lmysqlclient_r
1170 @@ -48,7 +48,7 @@
1171 SOURCES += drivers/odbc/qsql_odbc.cpp
1172
1173 mac:!contains( LIBS, .*odbc.* ):LIBS *= -liodbc
1174 - unix:!contains( LIBS, .*odbc.* ):LIBS *= -lodbc
1175 + unix:!win32:!contains( LIBS, .*odbc.* ):LIBS *= -lodbc
1176
1177 win32 {
1178 !win32-borland:LIBS *= -lodbc32
1179 @@ -60,7 +60,7 @@
1180 HEADERS += drivers/oci/qsql_oci.h
1181 SOURCES += drivers/oci/qsql_oci.cpp
1182
1183 - unix:!contains( LIBS, .*clnts.* ):LIBS += -lclntsh
1184 + unix:!win32:!contains( LIBS, .*clnts.* ):LIBS += -lclntsh
1185
1186 win32:LIBS += -loci
1187 }
1188 @@ -71,7 +71,7 @@
1189
1190 unix:LIBS += -L$SYBASE/lib -lsybdb
1191
1192 - win32 {
1193 + win32:!unix {
1194 !win32-borland:LIBS += -lNTWDBLIB
1195 win32-borland:LIBS += $(BCB)/lib/PSDK/NTWDBLIB.LIB
1196 }
1197 @@ -81,7 +81,7 @@
1198 HEADERS += drivers/db2/qsql_db2.h
1199 SOURCES += drivers/db2/qsql_db2.cpp
1200
1201 - unix:LIBS += -ldb2
1202 + unix:!win32:LIBS += -ldb2
1203
1204 win32 {
1205 !win32-borland:LIBS += -ldb2cli
1206 @@ -93,7 +93,7 @@
1207 HEADERS += drivers/ibase/qsql_ibase.h
1208 SOURCES += drivers/ibase/qsql_ibase.cpp
1209
1210 - unix:LIBS *= -lgds
1211 + unix:!win32:LIBS *= -lgds
1212
1213 win32 {
1214 !win32-borland:LIBS *= -lgds32_ms
685 diff -urN a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp 1215 diff -urN a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp
686 --- a/src/sql/drivers/tds/qsql_tds.cpp 2009-11-27 02:27:52.000000000 +0100 1216 --- a/src/sql/drivers/tds/qsql_tds.cpp 2009-11-27 02:27:52.000000000 +0100
687 +++ b/src/sql/drivers/tds/qsql_tds.cpp 2009-12-02 20:54:42.000000000 +0100 1217 +++ b/src/sql/drivers/tds/qsql_tds.cpp 2009-12-03 16:19:48.000000000 +0100
688 @@ -47,7 +47,8 @@ 1218 @@ -47,7 +47,8 @@
689 #else 1219 #else
690 #define Q_USE_SYBASE 1220 #define Q_USE_SYBASE
691 #endif 1221 #endif
692 - 1222 -
695 #include "qsql_tds.h" 1225 #include "qsql_tds.h"
696 1226
697 #include <qvariant.h> 1227 #include <qvariant.h>
698 diff -urN a/src/sql/drivers/tds/qsql_tds.h b/src/sql/drivers/tds/qsql_tds.h 1228 diff -urN a/src/sql/drivers/tds/qsql_tds.h b/src/sql/drivers/tds/qsql_tds.h
699 --- a/src/sql/drivers/tds/qsql_tds.h 2009-11-27 02:27:52.000000000 +0100 1229 --- a/src/sql/drivers/tds/qsql_tds.h 2009-11-27 02:27:52.000000000 +0100
700 +++ b/src/sql/drivers/tds/qsql_tds.h 2009-12-02 20:54:42.000000000 +0100 1230 +++ b/src/sql/drivers/tds/qsql_tds.h 2009-12-03 16:19:48.000000000 +0100
701 @@ -48,7 +48,8 @@ 1231 @@ -48,7 +48,8 @@
702 1232
703 #ifdef Q_OS_WIN32 1233 #ifdef Q_OS_WIN32
704 #define WIN32_LEAN_AND_MEAN 1234 #define WIN32_LEAN_AND_MEAN
705 -#define DBNTWIN32 // indicates 32bit windows dblib 1235 -#define DBNTWIN32 // indicates 32bit windows dblib
708 #include <QtCore/qt_windows.h> 1238 #include <QtCore/qt_windows.h>
709 #include <sqlfront.h> 1239 #include <sqlfront.h>
710 #include <sqldb.h> 1240 #include <sqldb.h>
711 diff -urN a/src/svg/svg.pro b/src/svg/svg.pro 1241 diff -urN a/src/svg/svg.pro b/src/svg/svg.pro
712 --- a/src/svg/svg.pro 2009-11-27 02:27:53.000000000 +0100 1242 --- a/src/svg/svg.pro 2009-11-27 02:27:53.000000000 +0100
713 +++ b/src/svg/svg.pro 2009-12-02 20:55:47.000000000 +0100 1243 +++ b/src/svg/svg.pro 2009-12-03 20:59:30.000000000 +0100
714 @@ -44,7 +44,8 @@ 1244 @@ -44,7 +44,8 @@
715 1245
716 #zlib support 1246 #zlib support
717 contains(QT_CONFIG, zlib) { 1247 contains(QT_CONFIG, zlib) {
718 - INCLUDEPATH += ../3rdparty/zlib 1248 - INCLUDEPATH += ../3rdparty/zlib
722 + unix|win32-g++:LIBS_PRIVATE += -lz 1252 + unix|win32-g++:LIBS_PRIVATE += -lz
723 + win32-msvc*|win32-icc:LIBS += zdll.lib 1253 + win32-msvc*|win32-icc:LIBS += zdll.lib
724 } 1254 }
725 diff -urN a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri 1255 diff -urN a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri
726 --- a/src/tools/bootstrap/bootstrap.pri 2009-11-27 02:27:53.000000000 +0100 1256 --- a/src/tools/bootstrap/bootstrap.pri 2009-11-27 02:27:53.000000000 +0100
727 +++ b/src/tools/bootstrap/bootstrap.pri 2009-12-02 20:55:47.000000000 +0100 1257 +++ b/src/tools/bootstrap/bootstrap.pri 2009-12-03 16:19:48.000000000 +0100
728 @@ -52,8 +52,8 @@ 1258 @@ -52,8 +52,8 @@
729 LIBS += -lbootstrap 1259 LIBS += -lbootstrap
730 } 1260 }
731 !contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib) { 1261 !contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib) {
732 - unix:LIBS += -lz 1262 - unix:LIBS += -lz
736 } 1266 }
737 win32:LIBS += -luser32 1267 win32:LIBS += -luser32
738 1268
739 diff -urN a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro 1269 diff -urN a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
740 --- a/src/tools/bootstrap/bootstrap.pro 2009-11-27 02:27:53.000000000 +0100 1270 --- a/src/tools/bootstrap/bootstrap.pro 2009-11-27 02:27:53.000000000 +0100
741 +++ b/src/tools/bootstrap/bootstrap.pro 2009-12-02 20:55:47.000000000 +0100 1271 +++ b/src/tools/bootstrap/bootstrap.pro 2009-12-03 17:47:51.000000000 +0100
1272 @@ -82,7 +82,7 @@
1273 ../../xml/dom/qdom.cpp \
1274 ../../xml/sax/qxml.cpp
1275
1276 -unix:SOURCES += ../../corelib/io/qfsfileengine_unix.cpp \
1277 +unix:!win32:SOURCES += ../../corelib/io/qfsfileengine_unix.cpp \
1278 ../../corelib/io/qfsfileengine_iterator_unix.cpp
1279
1280 win32:SOURCES += ../../corelib/io/qfsfileengine_win.cpp \
742 @@ -108,6 +108,9 @@ 1281 @@ -108,6 +108,9 @@
743 ../3rdparty/zlib/trees.c \ 1282 ../3rdparty/zlib/trees.c \
744 ../3rdparty/zlib/uncompr.c \ 1283 ../3rdparty/zlib/uncompr.c \
745 ../3rdparty/zlib/zutil.c 1284 ../3rdparty/zlib/zutil.c
746 +} else:!contains(QT_CONFIG, no-zlib) { 1285 +} else:!contains(QT_CONFIG, no-zlib) {
749 } 1288 }
750 1289
751 lib.CONFIG = dummy_install 1290 lib.CONFIG = dummy_install
752 diff -urN a/src/winmain/winmain.pro b/src/winmain/winmain.pro 1291 diff -urN a/src/winmain/winmain.pro b/src/winmain/winmain.pro
753 --- a/src/winmain/winmain.pro 2009-11-27 02:27:53.000000000 +0100 1292 --- a/src/winmain/winmain.pro 2009-11-27 02:27:53.000000000 +0100
754 +++ b/src/winmain/winmain.pro 2009-12-02 20:55:47.000000000 +0100 1293 +++ b/src/winmain/winmain.pro 2009-12-03 17:47:51.000000000 +0100
755 @@ -11,7 +11,7 @@ 1294 @@ -11,12 +11,12 @@
756 win32-g++:DEFINES += QT_NEEDS_QMAIN 1295 win32-g++:DEFINES += QT_NEEDS_QMAIN
757 win32-borland:DEFINES += QT_NEEDS_QMAIN 1296 win32-borland:DEFINES += QT_NEEDS_QMAIN
758 SOURCES = qtmain_win.cpp 1297 SOURCES = qtmain_win.cpp
759 - CONFIG += png zlib 1298 - CONFIG += png zlib
760 + CONFIG += png 1299 + CONFIG += png
761 CONFIG -= jpeg 1300 CONFIG -= jpeg
762 INCLUDEPATH += tmp $$QMAKE_INCDIR_QT/QtCore 1301 INCLUDEPATH += tmp $$QMAKE_INCDIR_QT/QtCore
763 } 1302 }
764 diff -urN a/lib/qjpeg.prl b/lib/qjpeg.prl 1303
765 --- a/lib/qjpeg.prl 1970-01-01 01:00:00.000000000 +0100 1304 -!win32:error("$$_FILE_ is intended only for Windows!")
766 +++ b/lib/qjpeg.prl 2009-12-03 00:48:41.000000000 +0100 1305 +!win32:warning("$$_FILE_ is intended only for Windows! This warning might be a spurious effect of fromfile function.")
767 @@ -0,0 +1 @@ 1306 include(../qbase.pri)
768 +QMAKE_PRL_LIBS = -ljpeg 1307 wince*:QMAKE_POST_LINK =
769 diff -urN a/lib/qmng.prl b/lib/qmng.prl 1308
770 --- a/lib/qmng.prl 1970-01-01 01:00:00.000000000 +0100 1309 diff -urN a/tools/assistant/compat/assistant.pro b/tools/assistant/compat/assistant.pro
771 +++ b/lib/qmng.prl 2009-12-03 00:56:02.000000000 +0100 1310 --- a/tools/assistant/compat/assistant.pro 2009-11-27 02:27:46.000000000 +0100
772 @@ -0,0 +1 @@ 1311 +++ b/tools/assistant/compat/assistant.pro 2009-12-03 17:47:52.000000000 +0100
773 +QMAKE_PRL_LIBS = -lmng 1312 @@ -6,7 +6,7 @@
774 diff -urN a/lib/qsqlite.prl b/lib/qsqlite.prl 1313
775 --- a/lib/qsqlite.prl 1970-01-01 01:00:00.000000000 +0100 1314 CONFIG += qt warn_on
776 +++ b/lib/qsqlite.prl 2009-12-03 00:56:37.000000000 +0100 1315
777 @@ -0,0 +1 @@ 1316 -unix:contains(QT_CONFIG, dbus):QT += dbus
778 +QMAKE_PRL_LIBS = -lsqlite3 1317 +unix:!win32:contains(QT_CONFIG, dbus):QT += dbus
779 diff -urN a/lib/qsqlodbc.prl b/lib/qsqlodbc.prl 1318
780 --- a/lib/qsqlodbc.prl 1970-01-01 01:00:00.000000000 +0100 1319 build_all:!build_pass {
781 +++ b/lib/qsqlodbc.prl 2009-12-03 00:56:37.000000000 +0100 1320 CONFIG -= build_all
782 @@ -0,0 +1 @@ 1321 @@ -67,7 +67,7 @@
783 +QMAKE_PRL_LIBS = -lodbc32 1322
784 diff -urN a/lib/qsqlpsql.prl b/lib/qsqlpsql.prl 1323 TRANSLATIONS = assistant_de.ts
785 --- a/lib/qsqlpsql.prl 1970-01-01 01:00:00.000000000 +0100 1324
786 +++ b/lib/qsqlpsql.prl 2009-12-03 00:56:37.000000000 +0100 1325 -unix:!contains(QT_CONFIG, zlib):LIBS += -lz
787 @@ -0,0 +1 @@ 1326 +unix:!win32:!contains(QT_CONFIG, zlib):LIBS += -lz
788 +QMAKE_PRL_LIBS = -lpq 1327
789 diff -urN a/lib/qsqltds.prl b/lib/qsqltds.prl 1328 contains(CONFIG, static): {
790 --- a/lib/qsqltds.prl 1970-01-01 01:00:00.000000000 +0100 1329 win32 {
791 +++ b/lib/qsqltds.prl 2009-12-03 00:56:37.000000000 +0100 1330 diff -urN a/tools/assistant/compat/compat.pro b/tools/assistant/compat/compat.pro
792 @@ -0,0 +1 @@ 1331 --- a/tools/assistant/compat/compat.pro 2009-11-27 02:27:46.000000000 +0100
793 +QMAKE_PRL_LIBS = -lsybdb -liconv 1332 +++ b/tools/assistant/compat/compat.pro 2009-12-03 20:59:30.000000000 +0100
794 diff -urN a/lib/qtiff.prl b/lib/qtiff.prl 1333 @@ -6,7 +6,7 @@
795 --- a/lib/qtiff.prl 1970-01-01 01:00:00.000000000 +0100 1334
796 +++ b/lib/qtiff.prl 2009-12-03 00:57:16.000000000 +0100 1335 CONFIG += qt warn_on
797 @@ -0,0 +1 @@ 1336
798 +QMAKE_PRL_LIBS = -ltiff 1337 -unix:contains(QT_CONFIG, dbus):QT += dbus
799 1338 +unix:!win32:contains(QT_CONFIG, dbus):QT += dbus
1339
1340 build_all:!build_pass {
1341 CONFIG -= build_all
1342 diff -urN a/tools/assistant/compat/lib/lib.pro b/tools/assistant/compat/lib/lib.pro
1343 --- a/tools/assistant/compat/lib/lib.pro 2009-11-27 02:27:46.000000000 +0100
1344 +++ b/tools/assistant/compat/lib/lib.pro 2009-12-03 21:26:24.000000000 +0100
1345 @@ -19,7 +19,7 @@
1346 DESTDIR = ../../../../lib
1347 DLLDESTDIR = ../../../../bin
1348
1349 -unix {
1350 +unix:!win32 {
1351 QMAKE_CFLAGS += $$QMAKE_CFLAGS_SHLIB
1352 QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_SHLIB
1353 }
1354 diff -urN a/tools/designer/src/designer/designer.pro b/tools/designer/src/designer/designer.pro
1355 --- a/tools/designer/src/designer/designer.pro 2009-11-27 02:27:46.000000000 +0100
1356 +++ b/tools/designer/src/designer/designer.pro 2009-12-03 17:47:52.000000000 +0100
1357 @@ -89,5 +89,5 @@
1358
1359 include(../sharedcomponents.pri)
1360
1361 -unix:!mac:LIBS += -lm
1362 +unix:!win32:!mac:LIBS += -lm
1363 TRANSLATIONS = designer_de.ts
1364 diff -urN a/tools/tools.pro b/tools/tools.pro
1365 --- a/tools/tools.pro 2009-11-27 02:27:47.000000000 +0100
1366 +++ b/tools/tools.pro 2009-12-03 17:47:52.000000000 +0100
1367 @@ -16,7 +16,7 @@
1368 SUBDIRS += linguist
1369 symbian: SUBDIRS = designer
1370 wince*: SUBDIRS = qtestlib designer
1371 - unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
1372 + unix:!win32:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
1373 win32:!wince*:SUBDIRS += activeqt
1374 }
1375