--- qt-x11-free-3.3.3/src/kernel/qapplication.cpp-- 2004-08-25 14:41:41.288905972 +0200 +++ qt-x11-free-3.3.3/src/kernel/qapplication.cpp 2004-08-25 14:45:56.067796047 +0200 @@ -1720,7 +1720,12 @@ QStringList QApplication::libraryPaths() { if ( !app_libpaths ) { app_libpaths = new QStringList; + QString installPathPlugins = QString::fromLocal8Bit(qInstallPathPlugins()); + QString arch_lib_plugindir = qInstallPathPlugins(); + arch_lib_plugindir += "/" QT_LIBNAME; + if ( QFile::exists( arch_lib_plugindir ) ) + app_libpaths->append( arch_lib_plugindir ); if ( QFile::exists(installPathPlugins) ) { #ifdef Q_WS_WIN installPathPlugins.replace('\\', '/'); --- qt-x11-free-3.3.3/configure.fix_lib64 2004-08-25 15:17:03.285697484 +0200 +++ qt-x11-free-3.3.3/configure 2004-08-25 15:28:52.972895110 +0200 @@ -296,6 +296,7 @@ OPT_VERBOSE=no OPT_HELP= # initalize variables used for installation +QT_LIBNAME= QT_INSTALL_PREFIX= QT_INSTALL_DOCS= QT_INSTALL_HEADERS= @@ -375,7 +376,7 @@ while [ "$#" -gt 0 ]; do UNKNOWN_ARG=yes fi ;; - -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey) + -libname|-prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` shift VAL=$1 @@ -475,6 +476,9 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + libname) + QT_LIBNAME="$VAL" + ;; prefix) QT_INSTALL_PREFIX="$VAL" ;; @@ -1029,6 +1033,8 @@ done # post initialize QT_INSTALL_* variables, and generate qconfig.cpp #------------------------------------------------------------------------------- +# default libname +[ -z "$QT_LIBNAME" ] && QT_LIBNAME=lib # default $outpath [ -z "$QT_INSTALL_PREFIX" ] && QT_INSTALL_PREFIX=$outpath # default PREFIX/doc @@ -2668,6 +2674,7 @@ if [ "$CFG_IPV6" = "auto" ]; then fi fi + # find if the platform supports X/Open Large File compilation environment if [ "$CFG_LARGEFILE" = "auto" ]; then if $unixtests/largefile.test $XQMAKESPEC $OPT_VERBOSE $relpath $outpath; then @@ -3171,6 +3178,7 @@ full) cat $relpath/src/tools/$QCONFIGFILE >>$outpath/include/qconfig.h.new ;; esac +echo "#define QT_LIBNAME \"${QT_LIBNAME}\"" >>$outpath/include/qconfig.h.new cat >> $outpath/include/qconfig.h.new <<EOF /* License information */