diff -Naur qt-mac-free-3.3.5/mkspecs/macx-g++/qmake.conf qt-mac-free-3.3.5_corr/mkspecs/macx-g++/qmake.conf --- qt-mac-free-3.3.5/mkspecs/macx-g++/qmake.conf 2005-09-02 14:43:36.000000000 +0200 +++ qt-mac-free-3.3.5_corr/mkspecs/macx-g++/qmake.conf 2005-10-09 20:21:18.000000000 +0200 @@ -26,6 +26,7 @@ QMAKE_CFLAGS_DEBUG = -g QMAKE_CFLAGS_SHLIB = -fPIC QMAKE_EXTENSION_SHLIB = dylib +QMAKE_EXTENSION_PLUGIN = so QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses QMAKE_CXX = c++ @@ -38,9 +39,9 @@ QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_LIBDIR = -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_LIBDIR = @PREFIX@/lib/qt3mac/lib +QMAKE_INCDIR_QT = @PREFIX@/lib/qt3mac/include +QMAKE_LIBDIR_QT = @PREFIX@/lib/qt3mac/lib QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \ /System/Library/Frameworks/AGL.framework/Headers/ @@ -51,12 +52,12 @@ QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = QMAKE_LFLAGS_APP = -prebind -QMAKE_LFLAGS_SHLIB = -prebind -dynamiclib -QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace +QMAKE_LFLAGS_SHLIB = -prebind -dynamiclib -single_module +QMAKE_LFLAGS_INCREMENTAL = -undefined dynamic_lookup QMAKE_LFLAGS_PLUGIN = -bundle #You probably don't want to mess with this, instead look at install_name_tool(1) #QMAKE_LFLAGS_SONAME = -install_name$${LITERAL_WHITESPACE}@executable_path/../Frameworks/ -QMAKE_LFLAGS_SONAME = -install_name$${LITERAL_WHITESPACE} +QMAKE_LFLAGS_SONAME = -install_name$${LITERAL_WHITESPACE}$$QMAKE_LIBDIR/ QMAKE_LFLAGS_THREAD = QMAKE_LFLAGS_VERSION = -current_version$${LITERAL_WHITESPACE} @@ -64,7 +65,7 @@ QMAKE_RPATH = -QMAKE_LIBS_DYNLOAD = +QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_QT = -lqt QMAKE_LIBS_QT_THREAD = -lqt-mt QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL diff -Naur qt-mac-free-3.3.5/mkspecs/macx-g++/qplatformdefs.h qt-mac-free-3.3.5_corr/mkspecs/macx-g++/qplatformdefs.h --- qt-mac-free-3.3.5/mkspecs/macx-g++/qplatformdefs.h 2005-05-05 02:17:04.000000000 +0200 +++ qt-mac-free-3.3.5_corr/mkspecs/macx-g++/qplatformdefs.h 2005-10-09 16:17:40.000000000 +0200 @@ -22,6 +22,7 @@ #include #include #include +#include #define QT_NO_LIBRARY_UNLOAD #include diff -Naur qt-mac-free-3.3.5/src/network/qdns.cpp qt-mac-free-3.3.5_corr/src/network/qdns.cpp --- qt-mac-free-3.3.5/src/network/qdns.cpp 2005-09-02 14:42:59.000000000 +0200 +++ qt-mac-free-3.3.5_corr/src/network/qdns.cpp 2005-10-09 20:28:15.000000000 +0200 @@ -76,7 +76,8 @@ #include "qcleanuphandler.h" #include #ifdef Q_OS_MAC -#include "../3rdparty/dlcompat/dlfcn.h" +#include +#define DL_PREFIX(x) x #endif //#define QDNS_DEBUG diff -Naur qt-mac-free-3.3.5/src/qt_professional.pri qt-mac-free-3.3.5_corr/src/qt_professional.pri --- qt-mac-free-3.3.5/src/qt_professional.pri 2004-02-06 13:08:19.000000000 +0100 +++ qt-mac-free-3.3.5_corr/src/qt_professional.pri 2005-10-09 16:20:08.000000000 +0200 @@ -25,7 +25,6 @@ unix { NETWORK_H = $$NETWORK_CPP } - mac:INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/dlcompat INCLUDEPATH += $$QT_SOURCE_TREE/src/network include( $$QT_SOURCE_TREE/src/network/qt_network.pri ) DEFINES *= QT_MODULE_NETWORK diff -Naur qt-mac-free-3.3.5/src/tools/qt_tools.pri qt-mac-free-3.3.5_corr/src/tools/qt_tools.pri --- qt-mac-free-3.3.5/src/tools/qt_tools.pri 2004-04-01 12:20:06.000000000 +0200 +++ qt-mac-free-3.3.5_corr/src/tools/qt_tools.pri 2005-10-09 16:22:01.000000000 +0200 @@ -101,10 +101,6 @@ $$TOOLS_CPP/qwaitcondition_unix.cpp mac:!x11:!embedded:SOURCES += $$TOOLS_CPP/qsettings_mac.cpp - mac { - SOURCES+=3rdparty/dlcompat/dlfcn.c - INCLUDEPATH+=3rdparty/dlcompat - } unix:SOURCES += $$TOOLS_CPP/qlibrary_unix.cpp SOURCES += $$TOOLS_CPP/qbitarray.cpp \