--- qt-copy-755604/config.tests/qws/opengles/opengles.pro 2007-08-02 11:33:10.000000000 -0400 +++ qt-copy-755604-new/config.tests/qws/opengles/opengles.pro 2008-01-09 12:57:43.000000000 -0500 @@ -2,3 +2,4 @@ QT -= gui network core INCLUDEPATH += $$QMAKE_INCDIR_OPENGL LIBS += -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL +CONFIG -= app_bundle --- qt-copy-755604/config.tests/unix/3dnow/3dnow.pro 2007-08-02 11:33:08.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/3dnow/3dnow.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,3 +1,2 @@ SOURCES = 3dnow.cpp -CONFIG -= x11 qt - +CONFIG -= x11 qt app_bundle --- qt-copy-755604/config.tests/unix/clock-monotonic/clock-monotonic.pro 2007-08-02 11:33:08.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/clock-monotonic/clock-monotonic.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,3 +1,3 @@ -CONFIG -= qt dylib mac_bundle +CONFIG -= qt dylib app_bundle SOURCES = clock-monotonic.cpp include(clock-monotonic.pri) --- qt-copy-755604/config.tests/unix/cups/cups.pro 2007-08-02 11:33:08.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/cups/cups.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,4 +1,3 @@ SOURCES = cups.cpp -CONFIG -= qt dylib -mac:CONFIG -= app_bundle +CONFIG -= qt dylib app_bundle LIBS += -lcups --- qt-copy-755604/config.tests/unix/db2/db2.pro 2007-08-02 11:33:09.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/db2/db2.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,4 +1,3 @@ SOURCES = db2.cpp -CONFIG -= qt dylib -mac:CONFIG -= app_bundle +CONFIG -= qt dylib app_bundle LIBS += -ldb2 --- qt-copy-755604/config.tests/unix/dbus/dbus.pro 2007-08-02 11:33:08.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/dbus/dbus.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,3 +1,2 @@ SOURCES = dbus.cpp -CONFIG -= qt -CONFIG -= app_bundle +CONFIG -= qt app_bundle --- qt-copy-755604/config.tests/unix/doubleformat/doubleformattest.pro 2007-08-02 11:33:07.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/doubleformat/doubleformattest.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,5 +1,4 @@ TARGET=doubleformattest -CONFIG-=qt dylib -mac:CONFIG -= app_bundle +CONFIG-=qt dylib app_bundle TEMPLATE=app SOURCES=doubleformattest.cpp --- qt-copy-755604/config.tests/unix/endian/endiantest.pro 2007-08-02 11:33:09.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/endian/endiantest.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,5 +1,4 @@ TARGET=endiantest -CONFIG-=qt dylib -mac:CONFIG -= app_bundle +CONFIG-=qt dylib app_bundle TEMPLATE=app SOURCES=endiantest.cpp --- qt-copy-755604/config.tests/unix/floatmath/floatmath.pro 2007-08-02 11:33:07.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/floatmath/floatmath.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,3 +1,3 @@ SOURCES = floatmath.cpp -CONFIG -= x11 qt +CONFIG -= x11 qt app_bundle --- qt-copy-755604/config.tests/unix/freetype/freetype.pro 2007-08-02 11:33:07.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/freetype/freetype.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,5 +1,5 @@ SOURCES = freetype.cpp CONFIG += x11 -CONFIG -= qt +CONFIG -= qt app_bundle LIBS += -lfreetype include(freetype.pri) --- qt-copy-755604/config.tests/unix/getaddrinfo/getaddrinfo.pro 2007-08-02 11:33:09.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/getaddrinfo/getaddrinfo.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,4 +1,3 @@ SOURCES = getaddrinfotest.cpp -CONFIG -= qt dylib -mac:CONFIG -= app_bundle +CONFIG -= qt dylib app_bundle solaris-cc*:LIBS += -lsocket -lnsl --- qt-copy-755604/config.tests/unix/getifaddrs/getifaddrs.pro 2007-08-02 11:33:09.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/getifaddrs/getifaddrs.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,6 +1,5 @@ TARGET=getifaddrs -CONFIG -= qt -mac:CONFIG -= app_bundle +CONFIG -= qt app_bundle QT = TEMPLATE=app SOURCES=getifaddrs.cpp --- qt-copy-755604/config.tests/unix/ibase/ibase.pro 2007-08-02 11:33:08.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/ibase/ibase.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,4 +1,3 @@ SOURCES = ibase.cpp -CONFIG -= qt dylib -mac:CONFIG -= app_bundle +CONFIG -= qt dylib app_bundle LIBS += -lgds --- qt-copy-755604/config.tests/unix/inotify/inotify.pro 2007-08-02 11:33:07.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/inotify/inotify.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,3 +1,2 @@ SOURCES = inotifytest.cpp -CONFIG -= qt dylib -mac:CONFIG -= app_bundle +CONFIG -= qt dylib app_bundle --- qt-copy-755604/config.tests/unix/ipv6/ipv6.pro 2007-08-02 11:33:09.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/ipv6/ipv6.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,3 +1,2 @@ SOURCES = ipv6test.cpp -CONFIG -= qt dylib -mac:CONFIG -= app_bundle +CONFIG -= qt dylib app_bundle --- qt-copy-755604/config.tests/unix/ipv6ifname/ipv6ifname.pro 2007-08-02 11:33:08.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/ipv6ifname/ipv6ifname.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,6 +1,5 @@ TARGET=ipv6ifname -CONFIG -= qt -mac:CONFIG -= app_bundle +CONFIG -= qt app_bundle QT = TEMPLATE=app SOURCES=ipv6ifname.cpp --- qt-copy-755604/config.tests/unix/largefile/largefile.pro 2007-08-02 11:33:09.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/largefile/largefile.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,3 +1,2 @@ SOURCES=largefiletest.cpp -CONFIG-=qt dylib -mac:CONFIG -= app_bundle +CONFIG-=qt dylib app_bundle --- qt-copy-755604/config.tests/unix/libjpeg/libjpeg.pro 2007-08-02 11:33:08.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/libjpeg/libjpeg.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,4 +1,3 @@ SOURCES = libjpeg.cpp -CONFIG -= qt dylib -mac:CONFIG -= app_bundle +CONFIG -= qt dylib app_bundle LIBS += -ljpeg --- qt-copy-755604/config.tests/unix/libmng/libmng.pro 2007-08-02 11:33:09.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/libmng/libmng.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,4 +1,3 @@ SOURCES = libmng.cpp -CONFIG -= qt dylib -mac:CONFIG -= app_bundle +CONFIG -= qt dylib app_bundle LIBS += -lmng --- qt-copy-755604/config.tests/unix/libpng/libpng.pro 2007-08-02 11:33:09.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/libpng/libpng.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,4 +1,3 @@ SOURCES = libpng.cpp -CONFIG -= qt dylib -mac:CONFIG -= app_bundle +CONFIG -= qt dylib app_bundle LIBS += -lpng --- qt-copy-755604/config.tests/unix/libtiff/libtiff.pro 2007-08-02 11:33:07.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/libtiff/libtiff.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,4 +1,3 @@ SOURCES = libtiff.cpp -CONFIG -= qt dylib -mac:CONFIG -= app_bundle +CONFIG -= qt dylib app_bundle LIBS += -ltiff --- qt-copy-755604/config.tests/unix/mmx/mmx.pro 2007-08-02 11:33:09.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/mmx/mmx.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,3 +1,2 @@ SOURCES = mmx.cpp -CONFIG -= x11 qt - +CONFIG -= x11 qt app_bundle --- qt-copy-755604/config.tests/unix/mysql_r/mysql_r.pro 2007-08-02 11:33:09.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/mysql_r/mysql_r.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,4 +1,3 @@ SOURCES = ../mysql/mysql.cpp -CONFIG -= qt dylib -CONFIG -= app_bundle +CONFIG -= qt dylib app_bundle LIBS += -lmysqlclient_r --- qt-copy-755604/config.tests/unix/nis/nis.pro 2007-08-02 11:33:09.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/nis/nis.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,5 +1,4 @@ SOURCES = nis.cpp -CONFIG -= qt dylib -mac: CONFIG -= app_bundle +CONFIG -= qt dylib app_bundle solaris-*:LIBS += -lnsl else:LIBS += $$QMAKE_LIBS_NIS --- qt-copy-755604/config.tests/unix/oci/oci.pro 2007-08-02 11:33:08.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/oci/oci.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,4 +1,3 @@ SOURCES = oci.cpp -CONFIG -= qt dylib -mac:CONFIG -= app_bundle +CONFIG -= qt dylib app_bundle LIBS += -lclntsh --- qt-copy-755604/config.tests/unix/odbc/odbc.pro 2007-08-02 11:33:09.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/odbc/odbc.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,4 +1,3 @@ SOURCES = odbc.cpp -CONFIG -= qt dylib -CONFIG -= app_bundle +CONFIG -= qt dylib app_bundle LIBS += -lodbc --- qt-copy-755604/config.tests/unix/psql/psql.pro 2007-08-02 11:33:08.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/psql/psql.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,4 +1,3 @@ SOURCES = psql.cpp -CONFIG -= qt dylib -CONFIG -= app_bundle +CONFIG -= qt dylib app_bundle LIBS += -lpq --- qt-copy-755604/config.tests/unix/ptrsize/ptrsizetest.pro 2007-08-02 11:33:09.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/ptrsize/ptrsizetest.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,5 +1,4 @@ TARGET=ptrsizetest -CONFIG-=qt dylib -mac:CONFIG -= app_bundle +CONFIG-=qt dylib app_bundle TEMPLATE=app SOURCES=ptrsizetest.cpp --- qt-copy-755604/config.tests/unix/sqlite/sqlite.pro 2007-08-02 11:33:09.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/sqlite/sqlite.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,4 +1,3 @@ SOURCES = sqlite.cpp -CONFIG -= qt dylib -mac:CONFIG -= app_bundle +CONFIG -= qt dylib app_bundle LIBS += -lsqlite3 --- qt-copy-755604/config.tests/unix/sqlite2/sqlite2.pro 2007-08-02 11:33:09.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/sqlite2/sqlite2.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,4 +1,3 @@ SOURCES = sqlite2.cpp -CONFIG -= qt dylib -mac:CONFIG -= app_bundle +CONFIG -= qt dylib app_bundle LIBS += -lsqlite --- qt-copy-755604/config.tests/unix/sse/sse.pro 2007-08-02 11:33:09.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/sse/sse.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,3 +1,2 @@ SOURCES = sse.cpp -CONFIG -= x11 qt - +CONFIG -= x11 qt app_bundle --- qt-copy-755604/config.tests/unix/sse2/sse2.pro 2007-08-02 11:33:09.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/sse2/sse2.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,3 +1,2 @@ SOURCES = sse2.cpp -CONFIG -= x11 qt - +CONFIG -= x11 qt app_bundle --- qt-copy-755604/config.tests/unix/stl/stl.pro 2007-08-02 11:33:08.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/stl/stl.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,3 +1,2 @@ SOURCES = stltest.cpp -CONFIG -= qt dylib -mac:CONFIG -= app_bundle +CONFIG -= qt dylib app_bundle --- qt-copy-755604/config.tests/unix/tds/tds.pro 2007-08-02 11:33:08.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/tds/tds.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,4 +1,3 @@ SOURCES = tds.cpp -CONFIG -= qt dylib -mac:CONFIG -= app_bundle +CONFIG -= qt dylib app_bundle LIBS += -lsybdb --- qt-copy-755604/config.tests/unix/tslib/tslib.pro 2007-08-02 11:33:08.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/tslib/tslib.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,3 +1,3 @@ SOURCES = tslib.cpp -CONFIG -= qt +CONFIG -= qt app_bundle LIBS += -lts --- qt-copy-755604/config.tests/unix/zlib/zlib.pro 2007-08-02 11:33:08.000000000 -0400 +++ qt-copy-755604-new/config.tests/unix/zlib/zlib.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,4 +1,3 @@ SOURCES = zlib.cpp -CONFIG -= qt dylib -mac:CONFIG -= app_bundle +CONFIG -= qt dylib app_bundle LIBS += -lz --- qt-copy-755604/config.tests/x11/fontconfig/fontconfig.pro 2007-08-02 11:33:10.000000000 -0400 +++ qt-copy-755604-new/config.tests/x11/fontconfig/fontconfig.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,5 +1,5 @@ SOURCES = fontconfig.cpp CONFIG += x11 -CONFIG -= qt +CONFIG -= qt app_bundle LIBS += -lfreetype -lfontconfig include(../../unix/freetype/freetype.pri) --- qt-copy-755604/config.tests/x11/notype/notypetest.pro 2007-08-02 11:33:10.000000000 -0400 +++ qt-copy-755604-new/config.tests/x11/notype/notypetest.pro 2008-01-09 12:57:43.000000000 -0500 @@ -1,5 +1,5 @@ TEMPLATE=app TARGET=notypetest -CONFIG-=qt +CONFIG-=qt app_bundle CONFIG+=x11 SOURCES=notypetest.cpp --- qt-copy-755604/configure 2007-12-11 18:43:14.000000000 -0500 +++ qt-copy-755604-new/configure 2008-01-09 12:57:43.000000000 -0500 @@ -994,16 +994,15 @@ CFG_BUILD_PARTS="$CFG_BUILD_PARTS $VAL" ;; x11) - if [ "$Edition" = "Trolltech" ] && [ "$VAL" = "yes" ]; then if [ "$PLATFORM_MAC" = "yes" ]; then PLATFORM_MAC=no elif [ "$PLATFORM_QWS" = "yes" ]; then PLATFORM_QWS=no fi - PLATFORM_X11=yes - else - UNKNOWN_OPT=yes + if [ "$CFG_FRAMEWORK" = "auto" ]; then + CFG_FRAMEWORK=no fi + PLATFORM_X11=yes ;; sdk) if [ "$PLATFORM_MAC" = "yes" ]; then @@ -3645,6 +3644,10 @@ EXTRA_LFLAGS="$EXTRA_LFLAGS \$(SDK_LFLAGS)" fi fi + if [ "$PLATFORM_X11" = "yes" ]; then + EXTRA_CFLAGS="$EXTRA_CFLAGS -D__USE_WS_X11__=1" + EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -D__USE_WS_X11__=1" + fi [ "$CFG_EMBEDDED" != "no" ] && EXTRA_CFLAGS="$EXTRA_CFLAGS -DQWS" if [ '!' -z "$D_FLAGS" ]; then for DEF in $D_FLAGS; do --- qt-copy-755604/configure-for-fink.sh 1969-12-31 19:00:00.000000000 -0500 +++ qt-copy-755604-new/configure-for-fink.sh 2008-01-09 12:57:43.000000000 -0500 @@ -0,0 +1,60 @@ +#!/bin/sh -e + +if [ -z "$1" ]; then + echo "usage: $0 /fink/prefix" + exit 1 +fi + +if [ -f /usr/lib/libresolv.dylib ]; then + LIBRESOLV="-lresolv" + perl -pi -e 's,#define QT_AOUT_UNDERSCORE,,' mkspecs/{darwin-g++,macx-g++}/qplatformdefs.h +else + LIBRESOLV="" +fi + +[ -z "$CC" ] && CC=gcc-4.0 +[ -z "$CXX" ] && CXX=g++-4.0 + +FINKPREFIX="$1"; shift +PKGNAME="$1"; shift +QTDIR=`pwd` +PATH="$QTDIR/bin:$FINKPREFIX/lib/freetype219/bin:$PATH" + +EXTRA_ARGS="" + +if [ "$PKGNAME" = "qt4-x11" ]; then + EXTRA_ARGS="-D__USE_WS_X11__=1 -x11 -platform darwin-g++ -xplatform darwin-g++" +else + EXTRA_ARGS="-platform macx-g++ -xplatform macx-g++" +fi + +export FINKPREFIX QTDIR PATH LIBRESOLV CC CXX EXTRA_ARGS + +perl -pi -e "s,\@PREFIX\@,$FINKPREFIX,g" mkspecs/darwin-g++/* +perl -pi -e "s,\@PKGNAME\@,$PKGNAME,g" mkspecs/darwin-g++/* +perl -pi -e "s,gcc-4.0,$CC,g" mkspecs/darwin-g++/* +perl -pi -e "s,g\+\+-3.3,$CXX,g" mkspecs/darwin-g++/* + +echo "yes" | sh ./configure \ + "-I$QTDIR/include" "-I$QTDIR/include/Qt" "-I$QTDIR/include/QtCore" \ + "-I$FINKPREFIX/lib/freetype219/include" "-I$FINKPREFIX/lib/freetype219/include/freetype2" \ + "-I$FINKPREFIX/lib/fontconfig2/include" "-I$FINKPREFIX/lib/fontconfig2/include" \ + "-I/usr/X11R6/include" "-I$FINKPREFIX/include" \ + "-L$FINKPREFIX/lib/freetype219/lib" "-L$FINKPREFIX/lib/fontconfig2/lib" \ + "-L$FINKPREFIX/lib" "-L/usr/X11R6/lib" \ + -DQT_DBUS_INIT_DEFAULT=1 $LIBRESOLV \ + -prefix "$FINKPREFIX/lib/$PKGNAME" -docdir "$FINKPREFIX/share/doc/$PKGNAME" \ + -no-exceptions -qt-gif -system-freetype \ + -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql \ + -plugin-sql-sqlite $EXTRA_ARGS "$@" + +# don't link against older versions of self +/usr/bin/find . -name Makefile -print0 | xargs -0 perl -pi -e "s,-L$FINKPREFIX/lib/$PKGNAME/lib,,g" + +# attempt to counterfix qmake's warped fileFixify logic that makes install break +# when $FINKPREFIX is a symlink and something exists already at -libdir or -datadir etc +# second, better attempt at unfixifying $FINKPREFIX: +pushd $FINKPREFIX; + FixifiedSW=`/bin/pwd`; +popd +/usr/bin/find . -name Makefile -print0 | xargs -0 perl -pi -e "s,\\$\\(INSTALL_ROOT\\)$FixifiedSW,\\$\\(INSTALL_ROOT\\)$FINKPREFIX,g" --- qt-copy-755604/mkspecs/common/mac-g++.conf 2007-08-02 11:33:06.000000000 -0400 +++ qt-copy-755604-new/mkspecs/common/mac-g++.conf 2008-01-09 12:57:43.000000000 -0500 @@ -50,7 +50,7 @@ QMAKE_LINK = c++ QMAKE_LINK_SHLIB = c++ -QMAKE_LFLAGS += -headerpad_max_install_names +QMAKE_LFLAGS += -headerpad_max_install_names -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib QMAKE_LFLAGS_RELEASE += QMAKE_LFLAGS_DEBUG += QMAKE_LFLAGS_APP += --- qt-copy-755604/mkspecs/darwin-g++/qmake.conf 2007-08-02 11:33:05.000000000 -0400 +++ qt-copy-755604-new/mkspecs/darwin-g++/qmake.conf 2008-01-09 12:57:43.000000000 -0500 @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release link_prl native_precompiled_headers +CONFIG += qt warn_on release global_init_link_order lib_version_first link_prl plugin_no_soname native_precompiled_headers QT += core gui DEFINES += __USE_WS_X11__ @@ -19,14 +19,17 @@ QMAKE_CFLAGS_DEPS = -M QMAKE_CFLAGS_WARN_ON = -Wall -W QMAKE_CFLAGS_WARN_OFF = -w -QMAKE_CFLAGS_RELEASE = -O2 +QMAKE_CFLAGS_RELEASE = -Os QMAKE_CFLAGS_DEBUG = -g QMAKE_CFLAGS_SHLIB = -fPIC QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB QMAKE_EXTENSION_SHLIB = dylib QMAKE_EXTENSION_PLUGIN = so QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses +QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden QMAKE_CFLAGS_THREAD = +QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} +QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} QMAKE_CXX = c++ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS @@ -38,9 +41,12 @@ QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC +QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden QMAKE_CXXFLAGS_THREAD = +QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} +QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -QMAKE_INCDIR = /usr/local/include +QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib @@ -51,17 +57,21 @@ QMAKE_LINK = c++ QMAKE_LINK_SHLIB = c++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = -headerpad_max_install_names -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = QMAKE_LFLAGS_APP = -prebind -QMAKE_LFLAGS_SHLIB = -prebind -dynamiclib -single_module -headerpad_max_install_names -QMAKE_LFLAGS_PLUGIN = -bundle +QMAKE_LFLAGS_SHLIB = -prebind -dynamiclib -single_module +QMAKE_LFLAGS_PLUGIN = -prebind -bundle QMAKE_LFLAGS_THREAD = +QMAKE_LFLAGS_SONAME += -install_name$${LITERAL_WHITESPACE} QMAKE_LFLAGS_VERSION = -current_version$${LITERAL_WHITESPACE} QMAKE_LFLAGS_COMPAT_VERSION = -compatibility_version$${LITERAL_WHITESPACE} +QMAKE_PCH_OUTPUT_EXT = .gch + +QMAKE_FIX_RPATH = install_name_tool -id QMAKE_RPATH = QMAKE_LIBS_DYNLOAD = @@ -88,5 +98,6 @@ QMAKE_DEL_DIR = rmdir QMAKE_CHK_DIR_EXISTS = test -d QMAKE_MKDIR = mkdir -p + include(../common/unix.conf) load(qt_config) --- qt-copy-755604/mkspecs/macx-g++/qmake.conf 2007-08-02 11:33:05.000000000 -0400 +++ qt-copy-755604-new/mkspecs/macx-g++/qmake.conf 2008-01-09 12:57:43.000000000 -0500 @@ -8,10 +8,13 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl +CONFIG += qt warn_on release app_bundle global_init_link_order lib_version_first link_prl plugin_no_soname native_precompiled_headers QT += core gui QMAKE_INCREMENTAL_STYLE = sublib include(../common/mac-g++.conf) +QMAKE_EXTENSION_PLUGIN = bundle +QMAKE_LFLAGS_PLUGIN = -prebind -bundle + load(qt_config) --- qt-copy-755604/projects.pro 2007-10-09 18:33:43.000000000 -0400 +++ qt-copy-755604-new/projects.pro 2008-01-09 12:57:43.000000000 -0500 @@ -8,7 +8,7 @@ cross_compile: CONFIG += nostrip isEmpty(QT_BUILD_PARTS) { #defaults - QT_BUILD_PARTS = libs tools examples demos + QT_BUILD_PARTS = libs tools } else { #make sure the order makes sense contains(QT_BUILD_PARTS, tools) { QT_BUILD_PARTS -= tools @@ -29,10 +29,6 @@ isEqual(PROJECT, tools) { !cross_compile:SUBDIRS += tools else:SUBDIRS += tools/qtestlib - } else:isEqual(PROJECT, examples) { - SUBDIRS += examples - } else:isEqual(PROJECT, demos) { - SUBDIRS += demos } else:isEqual(PROJECT, libs) { include(src/src.pro) } else:isEqual(PROJECT, qmake) { --- qt-copy-755604/qmake/generators/mac/pbuilder_pbx.cpp 2007-12-11 18:40:09.000000000 -0500 +++ qt-copy-755604-new/qmake/generators/mac/pbuilder_pbx.cpp 2008-01-09 12:57:43.000000000 -0500 @@ -47,7 +47,7 @@ # include # include #endif -#ifdef Q_OS_DARWIN +#ifdef Q_WS_MAC #include #include #endif @@ -1674,7 +1674,7 @@ } else { QString version, version_plist = project->first("QMAKE_PBUILDER_VERSION_PLIST"); if(version_plist.isEmpty()) { -#ifdef Q_OS_DARWIN +#ifdef Q_WS_MAC ret = QLatin1String("34"); QCFType cfurl; OSStatus err = LSFindApplicationForInfo(0, CFSTR("com.apple.Xcode"), 0, 0, &cfurl); --- qt-copy-755604/qmake/generators/unix/unixmake.cpp 2007-12-11 18:40:10.000000000 -0500 +++ qt-copy-755604-new/qmake/generators/unix/unixmake.cpp 2008-01-09 12:57:43.000000000 -0500 @@ -43,6 +43,8 @@ #include #include +bool handleframeworks = false; + void UnixMakefileGenerator::init() { @@ -338,6 +340,13 @@ } } } + +#if defined(Q_OS_DARWIN) + handleframeworks = true; +#else + if (Option::target_mode == Option::TARG_MACX_MODE) + handleframeworks = true; +#endif } void @@ -435,9 +444,9 @@ libdirs.append(f); } else if(opt.startsWith("-l")) { stub = opt.mid(2); - } else if(Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-F")) { + } else if(handleframeworks && opt.startsWith("-F")) { frameworkdirs.append(QMakeLocalFileName(opt.right(opt.length()-2))); - } else if(Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-framework")) { + } else if(handleframeworks && opt.startsWith("-framework")) { if(opt.length() > 11) { opt = opt.mid(11); } else { @@ -557,11 +566,11 @@ break; } } - } else if(Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-F")) { + } else if(handleframeworks && opt.startsWith("-F")) { QMakeLocalFileName f(opt.right(opt.length()-2)); if(!frameworkdirs.contains(f)) frameworkdirs.append(f); - } else if(Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-framework")) { + } else if(handleframeworks && opt.startsWith("-framework")) { if(opt.length() > 11) opt = opt.mid(11); else @@ -600,13 +609,13 @@ QString opt = l.at(lit).trimmed(); if(opt.startsWith("-")) { if(opt.startsWith("-L") || - (Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-F"))) { + (handleframeworks && opt.startsWith("-F"))) { if(lit == 0 || l.lastIndexOf(opt, lit-1) == -1) lflags.append(opt); } else if(opt.startsWith("-l")) { if(lit == l.size()-1 || l.indexOf(opt, lit+1) == -1) lflags.append(opt); - } else if(Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-framework")) { + } else if(handleframeworks && opt.startsWith("-framework")) { if(opt.length() > 11) opt = opt.mid(11); else --- qt-copy-755604/qmake/option.cpp 2007-12-11 18:40:10.000000000 -0500 +++ qt-copy-755604-new/qmake/option.cpp 2008-01-09 12:57:43.000000000 -0500 @@ -90,7 +90,7 @@ QStringList Option::shellPath; #if defined(Q_OS_WIN32) Option::TARG_MODE Option::target_mode = Option::TARG_WIN_MODE; -#elif defined(Q_OS_MAC) +#elif defined(Q_WS_MAC) Option::TARG_MODE Option::target_mode = Option::TARG_MACX_MODE; #elif defined(Q_OS_QNX6) Option::TARG_MODE Option::target_mode = Option::TARG_QNX6_MODE; --- qt-copy-755604/src/corelib/corelib.pro 2007-08-02 11:30:39.000000000 -0400 +++ qt-copy-755604-new/src/corelib/corelib.pro 2008-01-09 12:57:43.000000000 -0500 @@ -14,7 +14,7 @@ include(kernel/kernel.pri) include(codecs/codecs.pri) -mac:LIBS += -framework ApplicationServices +mac|darwin-*:LIBS += -framework ApplicationServices mac:lib_bundle:DEFINES += QT_NO_DEBUG_PLUGIN_CHECK win32:DEFINES-=QT_NO_CAST_TO_ASCII --- qt-copy-755604/src/corelib/global/qglobal.cpp 2007-12-11 18:38:43.000000000 -0500 +++ qt-copy-755604-new/src/corelib/global/qglobal.cpp 2008-01-09 12:57:43.000000000 -0500 @@ -1607,7 +1607,7 @@ const int QSysInfo::ByteOrder = ((*((unsigned char *) &qt_one) == 0) ? BigEndian : LittleEndian); #endif -#if !defined(QWS) && defined(Q_OS_MAC) +#if !defined(QWS) && defined(Q_WS_MAC) #include "private/qcore_mac_p.h" #include "qnamespace.h" --- qt-copy-755604/src/corelib/global/qlibraryinfo.cpp 2007-12-11 18:38:42.000000000 -0500 +++ qt-copy-755604-new/src/corelib/global/qlibraryinfo.cpp 2008-01-09 12:57:43.000000000 -0500 @@ -45,7 +45,7 @@ #else # include "qcoreapplication.h" #endif -#ifdef Q_OS_MAC +#ifdef Q_WS_MAC # include "private/qcore_mac_p.h" #endif @@ -109,7 +109,7 @@ qtconfig = qmake_libraryInfoFile(); #else if (!QFile::exists(qtconfig) && QCoreApplication::instance()) { -#ifdef Q_OS_MAC +#ifdef Q_WS_MAC CFBundleRef bundleRef = CFBundleGetMainBundle(); if (bundleRef) { QCFType urlRef = CFBundleCopyResourceURL(bundleRef, @@ -424,7 +424,7 @@ return QFileInfo(qmake_libraryInfoFile()).absolutePath(); #else if (QCoreApplication::instance()) { -#ifdef Q_OS_MAC +#ifdef Q_WS_MAC CFBundleRef bundleRef = CFBundleGetMainBundle(); if (bundleRef) { QCFType urlRef = CFBundleCopyBundleURL(bundleRef); --- qt-copy-755604/src/corelib/global/qnamespace.h 2007-12-11 18:38:43.000000000 -0500 +++ qt-copy-755604-new/src/corelib/global/qnamespace.h 2008-01-09 12:57:43.000000000 -0500 @@ -958,7 +958,7 @@ }; #if defined(QT3_SUPPORT) -#if defined(Q_OS_MAC) +#if defined(Q_WS_MAC) #ifndef qdoc typedef int MacintoshVersion; @@ -985,7 +985,7 @@ MV_PANTHER = QSysInfo::MV_PANTHER, MV_TIGER = QSysInfo::MV_TIGER }; -#endif // Q_OS_MAC +#endif // Q_WS_MAC #if defined(Q_OS_WIN) #ifndef qdoc --- qt-copy-755604/src/corelib/io/qfsfileengine_unix.cpp 2007-12-11 18:38:56.000000000 -0500 +++ qt-copy-755604-new/src/corelib/io/qfsfileengine_unix.cpp 2008-01-09 12:57:43.000000000 -0500 @@ -49,7 +49,7 @@ #include #include #include -#if !defined(QWS) && defined(Q_OS_MAC) +#if !defined(QWS) && defined(Q_WS_MAC) # include #endif @@ -500,7 +500,7 @@ return is_link; } -#if !defined(QWS) && defined(Q_OS_MAC) +#if !defined(QWS) && defined(Q_WS_MAC) static bool _q_isMacHidden(const QString &path) { OSErr err = noErr; @@ -583,7 +583,7 @@ ret |= ExeOtherPerm; } if (type & TypesMask) { -#if !defined(QWS) && defined(Q_OS_MAC) +#if !defined(QWS) && defined(Q_WS_MAC) bool foundAlias = false; { FSRef fref; @@ -605,7 +605,7 @@ ret |= FileType; else if (exists && (d->st.st_mode & S_IFMT) == S_IFDIR) ret |= DirectoryType; -#if !defined(QWS) && defined(Q_OS_MAC) +#if !defined(QWS) && defined(Q_WS_MAC) if((ret & DirectoryType) && (type & BundleType)) { QCFType url = CFURLCreateWithFileSystemPath(0, QCFString(d->filePath), kCFURLPOSIXPathStyle, true); @@ -621,7 +621,7 @@ if (exists) ret |= ExistsFlag; if (fileName(BaseName)[0] == QLatin1Char('.') -#if !defined(QWS) && defined(Q_OS_MAC) +#if !defined(QWS) && defined(Q_WS_MAC) || _q_isMacHidden(d->filePath) #endif ) @@ -636,7 +636,7 @@ { Q_D(const QFSFileEngine); if (file == BundleName) { -#if !defined(QWS) && defined(Q_OS_MAC) +#if !defined(QWS) && defined(Q_WS_MAC) QCFType url = CFURLCreateWithFileSystemPath(0, QCFString(d->filePath), kCFURLPOSIXPathStyle, true); if(CFDictionaryRef dict = CFBundleCopyInfoDictionaryForURL(url)) { @@ -781,7 +781,7 @@ return ret; } } -#if !defined(QWS) && defined(Q_OS_MAC) +#if !defined(QWS) && defined(Q_WS_MAC) { FSRef fref; if (FSPathMakeRef((const UInt8 *)QFile::encodeName(QDir::cleanPath(d->filePath)).data(), &fref, 0) == noErr) { --- qt-copy-755604/src/corelib/io/qprocess_unix.cpp 2007-12-11 18:38:56.000000000 -0500 +++ qt-copy-755604-new/src/corelib/io/qprocess_unix.cpp 2008-01-09 12:57:43.000000000 -0500 @@ -78,7 +78,7 @@ #include "qprocess.h" #include "qprocess_p.h" -#ifdef Q_OS_MAC +#ifdef Q_WS_MAC #include #endif @@ -591,7 +591,7 @@ // Encode the program name. QByteArray encodedProgramName = QFile::encodeName(program); -#ifdef Q_OS_MAC +#ifdef Q_WS_MAC // allow invoking of .app bundles on the Mac. QFileInfo fileInfo(QString::fromUtf8(encodedProgramName.constData())); if (encodedProgramName.endsWith(".app") && fileInfo.isDir()) { --- qt-copy-755604/src/corelib/io/qsettings.cpp 2007-12-11 18:38:56.000000000 -0500 +++ qt-copy-755604-new/src/corelib/io/qsettings.cpp 2008-01-09 12:57:43.000000000 -0500 @@ -288,7 +288,7 @@ // see also qsettings_win.cpp and qsettings_mac.cpp -#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC) +#if !defined(Q_OS_WIN) && !defined(Q_WS_MAC) QSettingsPrivate *QSettingsPrivate::create(QSettings::Format format, QSettings::Scope scope, const QString &organization, const QString &application) { @@ -921,7 +921,7 @@ extension = (format == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini"); readFunc = 0; writeFunc = 0; -#if defined(Q_OS_MAC) +#if defined(Q_WS_MAC) caseSensitivity = (format == QSettings::NativeFormat) ? Qt::CaseSensitive : Qt::CaseInsensitive; #else caseSensitivity = IniCaseSensitivity; @@ -1067,7 +1067,7 @@ pathHash->insert(pathHashKey(QSettings::IniFormat, QSettings::UserScope), userPath); pathHash->insert(pathHashKey(QSettings::IniFormat, QSettings::SystemScope), systemPath); -#ifndef Q_OS_MAC +#ifndef Q_WS_MAC pathHash->insert(pathHashKey(QSettings::NativeFormat, QSettings::UserScope), userPath); pathHash->insert(pathHashKey(QSettings::NativeFormat, QSettings::SystemScope), systemPath); #endif @@ -1453,7 +1453,7 @@ because they don't exist) are treated as empty files. */ if (file.isReadable() && fileInfo.size() != 0) { -#ifdef Q_OS_MAC +#ifdef Q_WS_MAC if (format == QSettings::NativeFormat) { ok = readPlistFile(confFile->name, &confFile->originalKeys); } else @@ -1499,7 +1499,7 @@ ParsedSettingsMap mergedKeys = confFile->mergedKeyMap(); if (file.isWritable()) { -#ifdef Q_OS_MAC +#ifdef Q_WS_MAC if (format == QSettings::NativeFormat) { ok = writePlistFile(confFile->name, mergedKeys); } else @@ -2591,7 +2591,7 @@ */ QSettings::QSettings(QObject *parent) : QObject(*QSettingsPrivate::create(NativeFormat, UserScope, -#ifdef Q_OS_MAC +#ifdef Q_WS_MAC QCoreApplication::organizationDomain().isEmpty() ? QCoreApplication::organizationName() : QCoreApplication::organizationDomain() @@ -3254,7 +3254,7 @@ void QSettings::setSystemIniPath(const QString &dir) { setPath(IniFormat, SystemScope, dir); -#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC) +#if !defined(Q_OS_WIN) && !defined(Q_WS_MAC) setPath(NativeFormat, SystemScope, dir); #endif } @@ -3268,7 +3268,7 @@ void QSettings::setUserIniPath(const QString &dir) { setPath(IniFormat, UserScope, dir); -#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC) +#if !defined(Q_OS_WIN) && !defined(Q_WS_MAC) setPath(NativeFormat, UserScope, dir); #endif } --- qt-copy-755604/src/corelib/io/qsettings_p.h 2007-12-11 18:38:56.000000000 -0500 +++ qt-copy-755604-new/src/corelib/io/qsettings_p.h 2008-01-09 12:57:43.000000000 -0500 @@ -273,7 +273,7 @@ void initAccess(); void syncConfFile(int confFileNo); bool writeIniFile(QIODevice &device, const ParsedSettingsMap &map); -#ifdef Q_OS_MAC +#ifdef Q_WS_MAC bool readPlistFile(const QString &fileName, ParsedSettingsMap *map) const; bool writePlistFile(const QString &fileName, const ParsedSettingsMap &map) const; #endif --- qt-copy-755604/src/corelib/plugin/qlibrary.cpp 2007-12-11 18:38:57.000000000 -0500 +++ qt-copy-755604-new/src/corelib/plugin/qlibrary.cpp 2008-01-09 12:57:43.000000000 -0500 @@ -47,7 +47,7 @@ #include #include #include -#ifdef Q_OS_MAC +#ifdef Q_WS_MAC # include #endif #ifndef NO_ERRNO_H @@ -64,7 +64,7 @@ # define QLIBRARY_AS_DEBUG true #endif -#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) +#if defined(Q_OS_UNIX) && !defined(Q_WS_MAC) // We don't use separate debug and release libs on UNIX, so we want // to allow loading plugins, regardless of how they were built. # define QT_NO_DEBUG_PLUGIN_CHECK @@ -289,7 +289,7 @@ return ret; } -#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) +#if defined(Q_OS_UNIX) && !defined(Q_WS_MAC) #if defined(Q_OS_FREEBSD) || defined(Q_OS_LINUX) # define USE_MMAP @@ -412,7 +412,7 @@ return ret; } -#endif // Q_OS_UNIX && !Q_OS_MAC +#endif // Q_OS_UNIX && !Q_WS_MAC typedef QMap LibraryMap; Q_GLOBAL_STATIC(LibraryMap, libraryMap) @@ -585,7 +585,7 @@ key = reg.at(2).toLatin1(); success = qt_version != 0; } else { -#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) +#if defined(Q_OS_UNIX) && !defined(Q_WS_MAC) if (!pHnd) { // use unix shortcut to avoid loading the library success = qt_unix_query(fileName, &qt_version, &debug, &key, this); --- qt-copy-755604/src/corelib/plugin/qlibrary_unix.cpp 2007-12-11 18:38:57.000000000 -0500 +++ qt-copy-755604-new/src/corelib/plugin/qlibrary_unix.cpp 2008-01-09 12:57:43.000000000 -0500 @@ -43,7 +43,7 @@ #ifndef QT_NO_LIBRARY -#ifdef Q_OS_MAC +#ifdef Q_WS_MAC # include #endif @@ -152,8 +152,9 @@ if (majorVerNum > -1) { suffixes << QString::fromLatin1(".%1.bundle").arg(majorVerNum); suffixes << QString::fromLatin1(".%1.dylib").arg(majorVerNum); + suffixes << QString::fromLatin1(".%1.so").arg(majorVerNum); } else { - suffixes << QLatin1String(".bundle") << QLatin1String(".dylib"); + suffixes << QLatin1String(".bundle") << QLatin1String(".dylib") << QLatin1String(".so"); } #endif } @@ -198,7 +199,7 @@ pHnd = dlopen(QFile::encodeName(attempt), dlFlags); } } -#ifdef Q_OS_MAC +#ifdef Q_WS_MAC if (!pHnd) { if (CFBundleRef bundle = CFBundleGetBundleWithIdentifier(QCFString(fileName))) { QCFType url = CFBundleCopyExecutableURL(bundle); @@ -228,7 +229,7 @@ return true; } -#ifdef Q_OS_MAC +#ifdef Q_WS_MAC Q_CORE_EXPORT void *qt_mac_resolve_sys(void *handle, const char *symbol) { return dlsym(handle, symbol); --- qt-copy-755604/src/corelib/tools/qlocale.cpp 2007-12-11 18:38:55.000000000 -0500 +++ qt-copy-755604-new/src/corelib/tools/qlocale.cpp 2008-01-09 12:57:43.000000000 -0500 @@ -48,7 +48,7 @@ # include "qt_windows.h" # include #endif -#if !defined(QWS) && defined(Q_OS_MAC) +#if !defined(QWS) && defined(Q_WS_MAC) # include "private/qcore_mac_p.h" #endif #include "private/qnumeric_p.h" @@ -884,7 +884,7 @@ } -#elif defined(Q_OS_MAC) +#elif defined(Q_WS_MAC) /****************************************************************************** ** Wrappers for Mac locale system functions */ --- qt-copy-755604/src/corelib/tools/qpoint.h 2007-12-11 18:38:55.000000000 -0500 +++ qt-copy-755604-new/src/corelib/tools/qpoint.h 2008-01-09 12:57:43.000000000 -0500 @@ -77,7 +77,7 @@ private: friend class QTransform; -#if defined(Q_OS_MAC) +#if defined(Q_WS_MAC) int yp; int xp; #else --- qt-copy-755604/src/corelib/tools/qrect.h 2007-12-11 18:38:55.000000000 -0500 +++ qt-copy-755604-new/src/corelib/tools/qrect.h 2008-01-09 12:57:43.000000000 -0500 @@ -165,7 +165,7 @@ #if defined(Q_WS_X11) || defined(Q_OS_TEMP) friend void qt_setCoords(QRect *r, int xp1, int yp1, int xp2, int yp2); #endif -#if defined(Q_OS_MAC) +#if defined(Q_WS_MAC) int y1; int x1; int y2; --- qt-copy-755604/src/corelib/tools/qstring.cpp 2007-12-11 18:38:55.000000000 -0500 +++ qt-copy-755604-new/src/corelib/tools/qstring.cpp 2008-01-09 12:57:43.000000000 -0500 @@ -49,7 +49,7 @@ #include "qhash.h" #include "qdebug.h" -#ifdef Q_OS_MAC +#ifdef Q_WS_MAC #include #endif @@ -4238,7 +4238,7 @@ default: return 0; } -#elif defined (Q_OS_MAC) +#elif defined (Q_WS_MAC) // Use CFStringCompare for comparing strings on Mac. This makes Qt order // strings the same way as native applications do, and also respects // the "Order for sorted lists" setting in the International preferences --- qt-copy-755604/src/gui/dialogs/qprintdialog.h 2007-12-11 18:39:13.000000000 -0500 +++ qt-copy-755604-new/src/gui/dialogs/qprintdialog.h 2008-01-09 12:57:43.000000000 -0500 @@ -59,7 +59,7 @@ int exec(); -#if defined (Q_OS_UNIX) && !defined (Q_OS_MAC) && defined (QT3_SUPPORT) +#if defined (Q_OS_UNIX) && !defined (Q_WS_MAC) && defined (QT3_SUPPORT) void setPrinter(QPrinter *, bool = false); QPrinter *printer() const; void addButton(QPushButton *button); --- qt-copy-755604/src/gui/kernel/qapplication.h 2007-12-11 18:39:12.000000000 -0500 +++ qt-copy-755604-new/src/gui/kernel/qapplication.h 2008-01-09 12:57:43.000000000 -0500 @@ -287,7 +287,7 @@ #if defined(Q_OS_WIN32) || defined(Q_OS_CYGWIN) static QT3_SUPPORT Qt::WindowsVersion winVersion() { return (Qt::WindowsVersion)QSysInfo::WindowsVersion; } #endif -#if defined(Q_OS_MAC) +#if defined(Q_WS_MAC) static QT3_SUPPORT Qt::MacintoshVersion macVersion() { return (Qt::MacintoshVersion)QSysInfo::MacintoshVersion; } #endif # ifndef QT_NO_CURSOR --- qt-copy-755604/src/gui/kernel/qapplication_p.h 2007-12-11 18:39:12.000000000 -0500 +++ qt-copy-755604-new/src/gui/kernel/qapplication_p.h 2008-01-09 12:57:43.000000000 -0500 @@ -82,7 +82,7 @@ # ifdef Q_OS_TEMP extern DWORD qt_cever; # endif -#elif defined (Q_OS_MAC) +#elif defined (Q_WS_MAC) extern QSysInfo::MacVersion qt_macver; #endif #if defined(Q_WS_QWS) --- qt-copy-755604/src/gui/widgets/qdockwidget.cpp 2007-12-11 18:39:23.000000000 -0500 +++ qt-copy-755604-new/src/gui/widgets/qdockwidget.cpp 2008-01-09 12:57:43.000000000 -0500 @@ -915,7 +915,7 @@ if (state->nca) { endDrag(); } -#ifdef Q_OS_MAC +#ifdef Q_WS_MAC else { // workaround for lack of mouse-grab on Mac QMainWindowLayout *layout = qobject_cast(q->parentWidget()->layout()); @@ -928,7 +928,7 @@ #endif break; case QEvent::NonClientAreaMouseButtonRelease: -#ifdef Q_OS_MAC +#ifdef Q_WS_MAC if (state) endDrag(); #endif --- qt-copy-755604/src/tools/uic/cpp/cppwriteinitialization.h 2007-12-11 18:39:48.000000000 -0500 +++ qt-copy-755604-new/src/tools/uic/cpp/cppwriteinitialization.h 2008-01-09 12:57:43.000000000 -0500 @@ -59,7 +59,7 @@ int compare(const FontHandle &) const; private: const DomFont *m_domFont; -#if defined(Q_OS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3) +#if defined(Q_WS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3) friend uint qHash(const FontHandle &); #endif }; @@ -73,12 +73,12 @@ int compare(const SizePolicyHandle &) const; private: const DomSizePolicy *m_domSizePolicy; -#if defined(Q_OS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3) +#if defined(Q_WS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3) friend uint qHash(const SizePolicyHandle &); #endif }; inline bool operator ==(const SizePolicyHandle &f1, const SizePolicyHandle &f2) { return f1.compare(f2) == 0; } -#if !(defined(Q_OS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3)) +#if !(defined(Q_WS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3)) inline bool operator <(const SizePolicyHandle &f1, const SizePolicyHandle &f2) { return f1.compare(f2) < 0; } #endif @@ -217,7 +217,7 @@ QHash m_colorBrushHash; // Map from font properties to font variable name for reuse // Map from size policy to variable for reuse -#if defined(Q_OS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3) +#if defined(Q_WS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3) typedef QHash FontPropertiesNameMap; typedef QHash SizePolicyNameMap; #else