diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2009-08-04 20:04:38 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2009-08-04 20:04:38 +0000 |
| commit | 437140d5ee7767647a4a8852a15ec4a5795de676 (patch) | |
| tree | 2443a6cb032d8f429ce900c305a7375c8e455d9e /devel | |
| parent | e4a16c160872cdf202f5fc612a2542966e0ac3af (diff) | |
| download | ports-437140d5ee7767647a4a8852a15ec4a5795de676.tar.gz ports-437140d5ee7767647a4a8852a15ec4a5795de676.zip | |
Notes
Diffstat (limited to 'devel')
69 files changed, 2065 insertions, 893 deletions
diff --git a/devel/Makefile b/devel/Makefile index d6ca23568257..e925f0251a1f 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -2549,6 +2549,7 @@ SUBDIR += qt4-qvfb SUBDIR += qt4-rcc SUBDIR += qt4-script + SUBDIR += qt4-scripttools SUBDIR += qt4-uic SUBDIR += qt4-uic3 SUBDIR += quilt diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile index 2d0323eaf7f6..e222c6073c78 100644 --- a/devel/dbus-qt4/Makefile +++ b/devel/dbus-qt4/Makefile @@ -25,7 +25,6 @@ QT_COMPONENTS= qmake_build moc_build rcc_build corelib gui xml QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_UNSAFE= yes - HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/qt4 diff --git a/devel/dbus-qt4/distinfo b/devel/dbus-qt4/distinfo index 1756af8b04d9..27b0949354e8 100644 --- a/devel/dbus-qt4/distinfo +++ b/devel/dbus-qt4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/dbus-qt4/pkg-plist b/devel/dbus-qt4/pkg-plist index 10c9fea69c2c..d989979ee813 100644 --- a/devel/dbus-qt4/pkg-plist +++ b/devel/dbus-qt4/pkg-plist @@ -19,6 +19,8 @@ include/qt4/Qt/qdbusmessage.h include/qt4/Qt/qdbusmetatype.h include/qt4/Qt/qdbusreply.h include/qt4/Qt/qdbusserver.h +include/qt4/Qt/qdbuspendingcall.h +include/qt4/Qt/qdbuspendingreply.h include/qt4/QtDBus/QDBusAbstractAdaptor include/qt4/QtDBus/QDBusAbstractInterface include/qt4/QtDBus/QDBusArgument @@ -35,6 +37,10 @@ include/qt4/QtDBus/QDBusServer include/qt4/QtDBus/QDBusSignature include/qt4/QtDBus/QDBusVariant include/qt4/QtDBus/QtDBus +include/qt4/QtDBus/QDBusPendingCall +include/qt4/QtDBus/QDBusPendingCallWatcher +include/qt4/QtDBus/QDBusPendingReplyData +include/qt4/QtDBus/QDBusPendingReply include/qt4/QtDBus/qdbusabstractadaptor.h include/qt4/QtDBus/qdbusabstractinterface.h include/qt4/QtDBus/qdbusargument.h @@ -47,15 +53,17 @@ include/qt4/QtDBus/qdbusinterface.h include/qt4/QtDBus/qdbusmacros.h include/qt4/QtDBus/qdbusmessage.h include/qt4/QtDBus/qdbusmetatype.h +include/qt4/QtDBus/qdbuspendingcall.h +include/qt4/QtDBus/qdbuspendingreply.h include/qt4/QtDBus/qdbusreply.h include/qt4/QtDBus/qdbusserver.h lib/qt4/libQtDBus.la lib/qt4/libQtDBus.prl lib/qt4/libQtDBus.so lib/qt4/libQtDBus.so.4 -lib/qt4/libQtDBus.so.4.4 -lib/qt4/libQtDBus.so.4.4.3 -%%DEBUG%%lib/qt4/libQtDBus.so.4.4.3.debug +lib/qt4/libQtDBus.so.4.5 +lib/qt4/libQtDBus.so.4.5.2 +%%DEBUG%%lib/qt4/libQtDBus.so.4.5.2.debug libdata/pkgconfig/QtDBus.pc @dirrm include/qt4/QtDBus @dirrmtry include/qt4/Qt diff --git a/devel/qmake/Makefile b/devel/qmake/Makefile index eaeb1c63cf5e..da3046f89877 100644 --- a/devel/qmake/Makefile +++ b/devel/qmake/Makefile @@ -1,69 +1,84 @@ -# New ports collection makefile for: qmake -# Date created: 2 September 2003 -# Whom: mi@aldan.algebra.com +# New ports collection makefile for: qmake-4 +# Date created: Tue Jul 12 16:04:29 UTC 2005 +# Whom: lofi@freebsd.org, +# mi@aldan.algebra.com # # $FreeBSD$ -# PORTNAME= qmake -PORTVERSION= 3.3.8 -PORTREVISION= 1 +PORTVERSION= ${QT4_VERSION} +PORTREVISION= 0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_QT} -DISTNAME= qt-x11-free-${PORTVERSION} +PKGNAMEPREFIX= qt4- +DISTNAME= qt-x11-opensource-src-${PORTVERSION} DIST_SUBDIR= KDE -MAINTAINER= mi@aldan.algebra.com +MAINTAINER= kde@FreeBSD.org COMMENT= The build utility of the Qt project +QT_NONSTANDARD= yes REINPLACE_ARGS= -i "" WRKSRC= ${WRKDIR}/${DISTNAME}/qmake MAKEFILE= ${FILESDIR}/Makefile.bsd -ALL_TARGET= -j`${SYSCTL} -n hw.ncpu` -PLIST_SUB+= _PREFIX="${PREFIX}" MAKE_ENV+= FILESDIR="${FILESDIR}" - -USE_BZIP2= yes +#USE_BZIP2= yes +MAKE_JOBS_SAFE= yes EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ + '${DISTNAME}/config.tests/unix/padstring' \ '${DISTNAME}/mkspecs' \ - '${DISTNAME}/src/*/*.h' '${DISTNAME}/qmake' \ - '${DISTNAME}/src/tools' - -.if !defined(NOPORTDOCS) -EXTRACT_AFTER_ARGS+='${DISTNAME}/doc/html/qmake*' -DOCSDIR=${PREFIX}/share/doc/qt -PLIST_SUB+= DOCSDIR='${DOCSDIR}' -post-install: - ${MKDIR} '${DOCSDIR}' - ${CP} -Rp '${WRKSRC:H}/doc/html' '${DOCSDIR}' -.endif + '${DISTNAME}/include/*/*' \ + '${DISTNAME}/src/*/*.h' \ + '${DISTNAME}/qmake' \ + '${DISTNAME}/src/corelib/tools' \ + '${DISTNAME}/src/corelib/io' \ + '${DISTNAME}/src/corelib/global' \ + '${DISTNAME}/src/corelib/plugin' \ + '${DISTNAME}/src/corelib/kernel' \ + '${DISTNAME}/src/script' \ + '${DISTNAME}/src/3rdparty/md4' \ + '${DISTNAME}/src/3rdparty/md5' \ + '${DISTNAME}/src/3rdparty/sha1' post-patch: - @${RM} -fr ${WRKSRC}/examples ${WRKSRC}/tutorial @${REINPLACE_CMD} -e 's|-O2|${CXXFLAGS}|' \ - -e 's|gcc|${CC}|' \ - -e 's|g++|${CXX}|' \ + -e 's|gcc.*|${CC}|' \ + -e 's|g++.*|${CXX}|' \ -e 's|/usr/local|${LOCALBASE}|' \ -e 's|/usr/X11R6|${LOCALBASE}|' \ -e 's|release|release thread|' \ -e 's|-pthread -D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \ -e 's|-pthread|${PTHREAD_LIBS}|' \ - ${WRKSRC}/../mkspecs/freebsd-g++/qmake.conf + -e 's|uic|uic-qt4|' \ + -e 's|moc|moc-qt4|' \ + ${WRKSRC}/../mkspecs/freebsd-g++/qmake.conf \ + ${WRKSRC}/../mkspecs/freebsd-g++34/qmake.conf \ + ${WRKSRC}/../mkspecs/freebsd-g++40/qmake.conf \ + ${WRKSRC}/../mkspecs/freebsd-icc/qmake.conf + @${REINPLACE_CMD} -e 's|include(../common/c++|include(../common/g++.conf)|' \ + ${WRKSRC}/../mkspecs/freebsd-g++/qmake.conf @${REINPLACE_CMD} -e 's|@QMAKE_QTOBJS@||g' ${WRKSRC}/Makefile.unix do-configure: ${SED} -e 's|/usr/local|${PREFIX}|g' \ < ${FILESDIR}/qconfig.cpp \ - > ${WRKSRC:H}/src/tools/qconfig.cpp + > ${WRKSRC:H}/src/corelib/global/qconfig.cpp ${ECHO} '/* empty */' > ${WRKSRC}/qconfig.h - ${LN} ${WRKSRC}/qconfig.h ${WRKSRC}/qmodules.h - ${LN} -s . ${WRKDIR}/${DISTNAME}/src/tools/private + ${LN} ${WRKSRC}/qconfig.h ${WRKSRC}/../include/QtCore/qconfig.h .include <bsd.port.pre.mk> +.include "${.CURDIR}/../../Mk/bsd.qt.mk" .if ${ARCH} == "alpha" CXXFLAGS+= -mieee .endif +.if ${OSVERSION} < 700042 && ${ARCH} == "amd64" +CXXFLAGS+= -fno-gcse +.endif + +post-install: + ${LN} -sf ${PREFIX}/share/qt4/mkspecs/freebsd-g++ ${PREFIX}/share/qt4/mkspecs/default + .include <bsd.port.post.mk> diff --git a/devel/qmake/distinfo b/devel/qmake/distinfo index 0a949f0f5ec5..27b0949354e8 100644 --- a/devel/qmake/distinfo +++ b/devel/qmake/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-free-3.3.8.tar.bz2) = cf3c43a7dfde5bfb76f8001102fe6e85 -SHA256 (KDE/qt-x11-free-3.3.8.tar.bz2) = e8c3f703d00a4e2ab9ba63fd474caa8a9d0aa3d7f1d5451dd162bec9d778a449 -SIZE (KDE/qt-x11-free-3.3.8.tar.bz2) = 14360483 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/qmake/files/Makefile.bsd b/devel/qmake/files/Makefile.bsd index 30c96ae66b1c..08ccc6fb6d8c 100644 --- a/devel/qmake/files/Makefile.bsd +++ b/devel/qmake/files/Makefile.bsd @@ -5,13 +5,20 @@ _OBJS!= ${MAKE} -f Makefile.unix -V OBJS -V QOBJS # next to -DHAVE_CONFIG_CPP below: #_OBJS:= ${_OBJS:S/qconfig.o//} SRCS:= ${_OBJS:.o=.cpp} -NOMAN= true # qmake.1 anyone? +NO_MAN= true # qmake.1 anyone? + +.PATH: ${.CURDIR} ${.CURDIR:H}/src/corelib/tools ${.CURDIR:H}/src/corelib/io \ + ${.CURDIR:H}/src/corelib/global ${.CURDIR:H}/src/corelib/plugin \ + ${.CURDIR:H}/src/corelib/kernel ${.CURDIR:H}/src/3rdparty/md5 \ + ${.CURDIR:H}/src/3rdparty/md4 ${.CURDIR:H}/src/3rdparty/sha1 \ + ${.CURDIR:H}/src/script -.PATH: ${.CURDIR} ${.CURDIR:H}/src/tools CXXFLAGS+=-I${.CURDIR:H}/mkspecs/freebsd-g++ -.for s in tools kernel codecs -CXXFLAGS+=-I${.CURDIR:H}/src/$s +.for s in src/corelib/arch/generic src/global src/tools src/kernel src/codecs \ + src/3rdparty/md5 src/3rdparty/md4 src/3rdparty/sha1 \ + src/script include/QtCore include +CXXFLAGS+=-I${.CURDIR:H}/$s .endfor .for g in /. /unix /win32 /mac @@ -22,7 +29,8 @@ CXXFLAGS+=-I${.CURDIR}/generators$g CXXFLAGS+=-I. -I"${FILESDIR}" CXXFLAGS+=-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT \ - -DQT_NO_STL -DQT_NO_COMPRESS -DQT_INSTALL_DATA="\"${SHAREDIR}\"" + -DQT_NO_STL -DQT_BUILD_QMAKE -DQT_NO_COMPRESS -DHAVE_QCONFIG_CPP \ + -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQMAKE_OPENSOURCE_EDITION # I guess, qconfig.cpp used to be optional, but no longer is -- due to # bit-rot in Qt sources. So we still have to compile it, but, by not @@ -30,9 +38,9 @@ CXXFLAGS+=-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT \ # it: # -DHAVE_QCONFIG_CPP -PROG_CXX= qmake +PROG_CXX= qmake-qt4 BINDIR= ${PREFIX}/bin -SHAREDIR=${PREFIX}/share/qt +SHAREDIR=${PREFIX}/share/qt4 ${SHAREDIR}: mkdir -p "$@" diff --git a/devel/qmake/files/qconfig.cpp b/devel/qmake/files/qconfig.cpp index 3079f2acd576..d662b424fce0 100644 --- a/devel/qmake/files/qconfig.cpp +++ b/devel/qmake/files/qconfig.cpp @@ -4,12 +4,16 @@ * The default prefix (/ usr / local) is dynamicly replaced * at configure time. */ -const char *qInstallPath() { return "/usr/local"; } -const char *qInstallPathDocs() { return "/usr/local/share/doc/qt"; } -const char *qInstallPathHeaders() { return "/usr/local/include"; } -const char *qInstallPathLibs() { return "/usr/local/lib"; } -const char *qInstallPathBins() { return "/usr/local/bin"; } -const char *qInstallPathPlugins() { return "/usr/local/plugins"; } -const char *qInstallPathData() { return "/usr/local/share/qt"; } -const char *qInstallPathTranslations() { return "/usr/local/translations"; } -const char *qInstallPathSysconf() { return "/usr/local/etc"; } +#define QT_CONFIGURE_LICENSEE "Open Source"; +#define QT_CONFIGURE_LICENSED_PRODUCTS "OpenSource"; +#define QT_CONFIGURE_PREFIX_PATH "/usr/local"; +#define QT_CONFIGURE_DOCUMENTATION_PATH "/usr/local/share/doc/qt4"; +#define QT_CONFIGURE_HEADERS_PATH "/usr/local/include/qt4"; +#define QT_CONFIGURE_LIBRARIES_PATH "/usr/local/lib/qt4"; +#define QT_CONFIGURE_BINARIES_PATH "/usr/local/bin"; +#define QT_CONFIGURE_PLUGINS_PATH "/usr/local/lib/qt4/plugins"; +#define QT_CONFIGURE_DATA_PATH "/usr/local/share/qt4"; +#define QT_CONFIGURE_TRANSLATIONS_PATH "/usr/local/share/qt4/translations"; +#define QT_CONFIGURE_SETTINGS_PATH "/usr/local/etc/xdg"; +#define QT_CONFIGURE_EXAMPLES_PATH "/usr/local/share/examples/qt4/examples"; +#define QT_CONFIGURE_DEMOS_PATH "/usr/local/share/examples/qt4/demos/"; diff --git a/devel/qmake/pkg-descr b/devel/qmake/pkg-descr index 9c1e694a6b71..eccbc5d9c1e0 100644 --- a/devel/qmake/pkg-descr +++ b/devel/qmake/pkg-descr @@ -3,6 +3,6 @@ developers target all major operating systems with a single application source code. Qmake is a project and makefile creating utility, that is part of Qt. -For ease of maintenance it is split out into a port of its own. +For ease of maintainance it is split out into a port of its own. WWW: http://www.trolltech.com/products/qt/index.html diff --git a/devel/qmake/pkg-plist b/devel/qmake/pkg-plist index 6eadb5351fe5..fda1a09e3087 100644 --- a/devel/qmake/pkg-plist +++ b/devel/qmake/pkg-plist @@ -1,207 +1,437 @@ -bin/qmake -@comment A bug in pkg_* prevents us from using %D below -@cwd %%_PREFIX%%/share/qt/mkspecs -aix-g++-64/qmake.conf -aix-g++-64/qplatformdefs.h -aix-g++/qmake.conf -aix-g++/qplatformdefs.h -aix-xlc-64/qmake.conf -aix-xlc-64/qplatformdefs.h -aix-xlc/qmake.conf -aix-xlc/qplatformdefs.h -bsdi-g++/qmake.conf -bsdi-g++/qplatformdefs.h -cygwin-g++/qmake.conf -cygwin-g++/qplatformdefs.h -darwin-g++/qmake.conf -darwin-g++/qplatformdefs.h -dgux-g++/qmake.conf -dgux-g++/qplatformdefs.h -freebsd-g++/qmake.conf -freebsd-g++/qplatformdefs.h -freebsd-g++34/qmake.conf -freebsd-g++34/qplatformdefs.h -freebsd-icc/qmake.conf -freebsd-icc/qplatformdefs.h -hpux-acc-64/qmake.conf -hpux-acc-64/qplatformdefs.h -hpux-acc-o64/qmake.conf -hpux-acc-o64/qplatformdefs.h -hpux-acc/qmake.conf -hpux-acc/qplatformdefs.h -hpux-cc/qmake.conf -hpux-cc/qplatformdefs.h -hpux-g++-64/qmake.conf -hpux-g++-64/qplatformdefs.h -hpux-g++/qmake.conf -hpux-g++/qplatformdefs.h -hpuxi-acc-32/qmake.conf -hpuxi-acc-32/qplatformdefs.h -hpuxi-acc-64/qmake.conf -hpuxi-acc-64/qplatformdefs.h -hurd-g++/qmake.conf -hurd-g++/qplatformdefs.h -irix-cc-64/qmake.conf -irix-cc-64/qplatformdefs.h -irix-cc-o32/qmake.conf -irix-cc-o32/qplatformdefs.h -irix-cc/qmake.conf -irix-cc/qplatformdefs.h -irix-g++/qmake.conf -irix-g++/qplatformdefs.h -linux-cxx/qmake.conf -linux-cxx/qplatformdefs.h -linux-ecc-64/qmake.conf -linux-ecc-64/qplatformdefs.h -linux-g++-32/qmake.conf -linux-g++-32/qplatformdefs.h -linux-g++-64/qmake.conf -linux-g++-64/qplatformdefs.h -linux-g++/qmake.conf -linux-g++/qplatformdefs.h -linux-icc/qmake.conf -linux-icc/qplatformdefs.h -linux-kcc/qmake.conf -linux-kcc/qplatformdefs.h -linux-kylix/qmake.conf -linux-kylix/qplatformdefs.h -linux-pgcc/qmake.conf -linux-pgcc/qplatformdefs.h -lynxos-g++/qmake.conf -lynxos-g++/qplatformdefs.h -macx-g++/Info.plist.app -macx-g++/qmake.conf -macx-g++/qplatformdefs.h -macx-mwerks/README -macx-mwerks/mwerkstmpl.xml -macx-mwerks/qmake.conf -macx-mwerks/qplatformdefs.h -macx-pbuilder/Info.plist.app -macx-pbuilder/qmake.conf -macx-pbuilder/qplatformdefs.h -macx-xlc/qmake.conf -macx-xlc/qplatformdefs.h -netbsd-g++/qmake.conf -netbsd-g++/qplatformdefs.h -openbsd-g++/qmake.conf -openbsd-g++/qplatformdefs.h -qnx-g++/qmake.conf -qnx-g++/qplatformdefs.h -reliant-cds-64/qmake.conf -reliant-cds-64/qplatformdefs.h -reliant-cds/qmake.conf -reliant-cds/qplatformdefs.h -sco-cc/qmake.conf -sco-cc/qplatformdefs.h -sco-g++/qmake.conf -sco-g++/qplatformdefs.h -solaris-cc-64/qmake.conf -solaris-cc-64/qplatformdefs.h -solaris-cc/qmake.conf -solaris-cc/qplatformdefs.h -solaris-g++-64/qmake.conf -solaris-g++-64/qplatformdefs.h -solaris-g++/qmake.conf -solaris-g++/qplatformdefs.h -tru64-cxx/qmake.conf -tru64-cxx/qplatformdefs.h -tru64-g++/qmake.conf -tru64-g++/qplatformdefs.h -unixware-cc/qmake.conf -unixware-cc/qplatformdefs.h -unixware-g++/qmake.conf -unixware-g++/qplatformdefs.h -win32-borland/qmake.conf -win32-borland/qplatformdefs.h -win32-g++/qmake.conf -win32-g++/qplatformdefs.h -win32-g++/qtcrtentrypoint.cpp -win32-icc/qmake.conf -win32-icc/qplatformdefs.h -win32-icc/win32app.dsp -win32-icc/win32dll.dsp -win32-icc/win32lib.dsp -win32-msvc.net/qmake.conf -win32-msvc.net/qplatformdefs.h -win32-msvc/qmake.conf -win32-msvc/qplatformdefs.h -win32-msvc/win32app.dsp -win32-msvc/win32dll.dsp -win32-msvc/win32lib.dsp -win32-msvc2005/qmake.conf -win32-msvc2005/qplatformdefs.h -win32-watcom/qmake.conf -@dirrm aix-g++ -@dirrm aix-g++-64 -@dirrm aix-xlc -@dirrm aix-xlc-64 -@dirrm bsdi-g++ -@dirrm cygwin-g++ -@dirrm darwin-g++ -@dirrm dgux-g++ -@dirrm freebsd-g++ -@dirrm freebsd-g++34 -@dirrm freebsd-icc -@dirrm hpux-acc -@dirrm hpux-acc-64 -@dirrm hpux-acc-o64 -@dirrm hpux-cc -@dirrm hpux-g++ -@dirrm hpux-g++-64 -@dirrm hpuxi-acc-32 -@dirrm hpuxi-acc-64 -@dirrm hurd-g++ -@dirrm irix-cc -@dirrm irix-cc-64 -@dirrm irix-cc-o32 -@dirrm irix-g++ -@dirrm linux-cxx -@dirrm linux-ecc-64 -@dirrm linux-g++ -@dirrm linux-g++-32 -@dirrm linux-g++-64 -@dirrm linux-icc -@dirrm linux-kcc -@dirrm linux-kylix -@dirrm linux-pgcc -@dirrm lynxos-g++ -@dirrm macx-g++ -@dirrm macx-mwerks -@dirrm macx-pbuilder -@dirrm macx-xlc -@dirrm netbsd-g++ -@dirrm openbsd-g++ -@dirrm qnx-g++ -@dirrm reliant-cds -@dirrm reliant-cds-64 -@dirrm sco-cc -@dirrm sco-g++ -@dirrm solaris-cc -@dirrm solaris-cc-64 -@dirrm solaris-g++ -@dirrm solaris-g++-64 -@dirrm tru64-cxx -@dirrm tru64-g++ -@dirrm unixware-cc -@dirrm unixware-g++ -@dirrm win32-borland -@dirrm win32-g++ -@dirrm win32-icc -@dirrm win32-msvc -@dirrm win32-msvc.net -@dirrm win32-msvc2005 -@dirrm win32-watcom -@unexec rmdir %%_PREFIX%%/share/qt/mkspecs -@unexec rmdir %%_PREFIX%%/share/qt || echo %%_PREFIX%%/share/qt is still in use -- probably by the rest of Qt -%%PORTDOCS%%@cwd %%DOCSDIR%% -%%PORTDOCS%%html/qmake.dcf -%%PORTDOCS%%html/qmake-manual.html -%%PORTDOCS%%html/qmake-manual-1.html -%%PORTDOCS%%html/qmake-manual-2.html -%%PORTDOCS%%html/qmake-manual-3.html -%%PORTDOCS%%html/qmake-manual-4.html -%%PORTDOCS%%html/qmake-manual-5.html -%%PORTDOCS%%html/qmake-manual-6.html -%%PORTDOCS%%html/qmake-manual-7.html -%%PORTDOCS%%html/qmake-manual-8.html -%%PORTDOCS%%@unexec (rmdir %%DOCSDIR%%/html && rmdir %%DOCSDIR%%) || echo %%DOCSDIR%% is still in use -- by other Qt docs? +bin/qmake-qt4 +share/qt4/mkspecs/aix-g++-64/qmake.conf +share/qt4/mkspecs/aix-g++-64/qplatformdefs.h +share/qt4/mkspecs/aix-g++/qmake.conf +share/qt4/mkspecs/aix-g++/qplatformdefs.h +share/qt4/mkspecs/aix-xlc-64/qmake.conf +share/qt4/mkspecs/aix-xlc-64/qplatformdefs.h +share/qt4/mkspecs/aix-xlc/qmake.conf +share/qt4/mkspecs/aix-xlc/qplatformdefs.h +share/qt4/mkspecs/common/g++.conf +share/qt4/mkspecs/common/linux.conf +share/qt4/mkspecs/common/llvm.conf +share/qt4/mkspecs/common/mac-g++.conf +share/qt4/mkspecs/common/mac-llvm.conf +share/qt4/mkspecs/common/mac.conf +share/qt4/mkspecs/common/qws.conf +share/qt4/mkspecs/common/unix.conf +share/qt4/mkspecs/common/wince.conf +share/qt4/mkspecs/cygwin-g++/qmake.conf +share/qt4/mkspecs/cygwin-g++/qplatformdefs.h +share/qt4/mkspecs/darwin-g++/qmake.conf +share/qt4/mkspecs/darwin-g++/qplatformdefs.h +share/qt4/mkspecs/default +share/qt4/mkspecs/features/assistant.prf +share/qt4/mkspecs/features/build_pass.prf +share/qt4/mkspecs/features/dbusadaptors.prf +share/qt4/mkspecs/features/dbusinterfaces.prf +share/qt4/mkspecs/features/debug.prf +share/qt4/mkspecs/features/debug_and_release.prf +share/qt4/mkspecs/features/default_post.prf +share/qt4/mkspecs/features/default_pre.prf +share/qt4/mkspecs/features/designer.prf +share/qt4/mkspecs/features/dll.prf +share/qt4/mkspecs/features/exclusive_builds.prf +share/qt4/mkspecs/features/help.prf +share/qt4/mkspecs/features/include_source_dir.prf +share/qt4/mkspecs/features/incredibuild_xge.prf +share/qt4/mkspecs/features/lex.prf +share/qt4/mkspecs/features/link_pkgconfig.prf +share/qt4/mkspecs/features/mac/default_post.prf +share/qt4/mkspecs/features/mac/default_pre.prf +share/qt4/mkspecs/features/mac/dwarf2.prf +share/qt4/mkspecs/features/mac/objective_c.prf +share/qt4/mkspecs/features/mac/ppc.prf +share/qt4/mkspecs/features/mac/ppc64.prf +share/qt4/mkspecs/features/mac/rez.prf +share/qt4/mkspecs/features/mac/sdk.prf +share/qt4/mkspecs/features/mac/x86.prf +share/qt4/mkspecs/features/mac/x86_64.prf +share/qt4/mkspecs/features/moc.prf +share/qt4/mkspecs/features/no_debug_info.prf +share/qt4/mkspecs/features/qdbus.prf +share/qt4/mkspecs/features/qt.prf +share/qt4/mkspecs/features/qt_config.prf +share/qt4/mkspecs/features/qt_functions.prf +share/qt4/mkspecs/features/qtestlib.prf +share/qt4/mkspecs/features/qtopia.prf +share/qt4/mkspecs/features/qtopiainc.prf +share/qt4/mkspecs/features/qtopialib.prf +share/qt4/mkspecs/features/release.prf +share/qt4/mkspecs/features/resources.prf +share/qt4/mkspecs/features/shared.prf +share/qt4/mkspecs/features/silent.prf +share/qt4/mkspecs/features/static.prf +share/qt4/mkspecs/features/static_and_shared.prf +share/qt4/mkspecs/features/staticlib.prf +share/qt4/mkspecs/features/uic.prf +share/qt4/mkspecs/features/uitools.prf +share/qt4/mkspecs/features/unix/bsymbolic_functions.prf +share/qt4/mkspecs/features/unix/dylib.prf +share/qt4/mkspecs/features/unix/hide_symbols.prf +share/qt4/mkspecs/features/unix/largefile.prf +share/qt4/mkspecs/features/unix/opengl.prf +share/qt4/mkspecs/features/unix/separate_debug_info.prf +share/qt4/mkspecs/features/unix/thread.prf +share/qt4/mkspecs/features/unix/x11.prf +share/qt4/mkspecs/features/unix/x11inc.prf +share/qt4/mkspecs/features/unix/x11lib.prf +share/qt4/mkspecs/features/unix/x11sm.prf +share/qt4/mkspecs/features/use_c_linker.prf +share/qt4/mkspecs/features/warn_off.prf +share/qt4/mkspecs/features/warn_on.prf +share/qt4/mkspecs/features/win32/console.prf +share/qt4/mkspecs/features/win32/default_post.prf +share/qt4/mkspecs/features/win32/default_pre.prf +share/qt4/mkspecs/features/win32/dumpcpp.prf +share/qt4/mkspecs/features/win32/embed_manifest_dll.prf +share/qt4/mkspecs/features/win32/embed_manifest_exe.prf +share/qt4/mkspecs/features/win32/exceptions.prf +share/qt4/mkspecs/features/win32/exceptions_off.prf +share/qt4/mkspecs/features/win32/ltcg.prf +share/qt4/mkspecs/features/win32/opengl.prf +share/qt4/mkspecs/features/win32/qaxcontainer.prf +share/qt4/mkspecs/features/win32/qaxserver.prf +share/qt4/mkspecs/features/win32/qt_dll.prf +share/qt4/mkspecs/features/win32/rtti.prf +share/qt4/mkspecs/features/win32/rtti_off.prf +share/qt4/mkspecs/features/win32/stl.prf +share/qt4/mkspecs/features/win32/stl_off.prf +share/qt4/mkspecs/features/win32/thread.prf +share/qt4/mkspecs/features/win32/thread_off.prf +share/qt4/mkspecs/features/win32/windows.prf +share/qt4/mkspecs/features/yacc.prf +share/qt4/mkspecs/freebsd-g++/qmake.conf +share/qt4/mkspecs/freebsd-g++/qplatformdefs.h +share/qt4/mkspecs/freebsd-g++34/qmake.conf +share/qt4/mkspecs/freebsd-g++34/qplatformdefs.h +share/qt4/mkspecs/freebsd-g++40/qmake.conf +share/qt4/mkspecs/freebsd-g++40/qplatformdefs.h +share/qt4/mkspecs/freebsd-icc/qmake.conf +share/qt4/mkspecs/freebsd-icc/qplatformdefs.h +share/qt4/mkspecs/hpux-acc-64/qmake.conf +share/qt4/mkspecs/hpux-acc-64/qplatformdefs.h +share/qt4/mkspecs/hpux-acc-o64/qmake.conf +share/qt4/mkspecs/hpux-acc-o64/qplatformdefs.h +share/qt4/mkspecs/hpux-acc/qmake.conf +share/qt4/mkspecs/hpux-acc/qplatformdefs.h +share/qt4/mkspecs/hpux-g++-64/qmake.conf +share/qt4/mkspecs/hpux-g++-64/qplatformdefs.h +share/qt4/mkspecs/hpux-g++/qmake.conf +share/qt4/mkspecs/hpux-g++/qplatformdefs.h +share/qt4/mkspecs/hpuxi-acc-32/qmake.conf +share/qt4/mkspecs/hpuxi-acc-32/qplatformdefs.h +share/qt4/mkspecs/hpuxi-acc-64/qmake.conf +share/qt4/mkspecs/hpuxi-acc-64/qplatformdefs.h +share/qt4/mkspecs/hpuxi-g++-64/qmake.conf +share/qt4/mkspecs/hpuxi-g++-64/qplatformdefs.h +share/qt4/mkspecs/hurd-g++/qmake.conf +share/qt4/mkspecs/hurd-g++/qplatformdefs.h +share/qt4/mkspecs/irix-cc-64/qmake.conf +share/qt4/mkspecs/irix-cc-64/qplatformdefs.h +share/qt4/mkspecs/irix-cc/qmake.conf +share/qt4/mkspecs/irix-cc/qplatformdefs.h +share/qt4/mkspecs/irix-g++-64/qmake.conf +share/qt4/mkspecs/irix-g++-64/qplatformdefs.h +share/qt4/mkspecs/irix-g++/qmake.conf +share/qt4/mkspecs/irix-g++/qplatformdefs.h +share/qt4/mkspecs/linux-cxx/qmake.conf +share/qt4/mkspecs/linux-cxx/qplatformdefs.h +share/qt4/mkspecs/linux-ecc-64/qmake.conf +share/qt4/mkspecs/linux-ecc-64/qplatformdefs.h +share/qt4/mkspecs/linux-g++-32/qmake.conf +share/qt4/mkspecs/linux-g++-32/qplatformdefs.h +share/qt4/mkspecs/linux-g++-64/qmake.conf +share/qt4/mkspecs/linux-g++-64/qplatformdefs.h +share/qt4/mkspecs/linux-g++/qmake.conf +share/qt4/mkspecs/linux-g++/qplatformdefs.h +share/qt4/mkspecs/linux-icc-32/qmake.conf +share/qt4/mkspecs/linux-icc-32/qplatformdefs.h +share/qt4/mkspecs/linux-icc-64/qmake.conf +share/qt4/mkspecs/linux-icc-64/qplatformdefs.h +share/qt4/mkspecs/linux-icc/qmake.conf +share/qt4/mkspecs/linux-icc/qplatformdefs.h +share/qt4/mkspecs/linux-kcc/qmake.conf +share/qt4/mkspecs/linux-kcc/qplatformdefs.h +share/qt4/mkspecs/linux-llvm/qmake.conf +share/qt4/mkspecs/linux-llvm/qplatformdefs.h +share/qt4/mkspecs/linux-lsb-g++/qmake.conf +share/qt4/mkspecs/linux-lsb-g++/qplatformdefs.h +share/qt4/mkspecs/linux-pgcc/qmake.conf +share/qt4/mkspecs/linux-pgcc/qplatformdefs.h +share/qt4/mkspecs/lynxos-g++/qmake.conf +share/qt4/mkspecs/lynxos-g++/qplatformdefs.h +share/qt4/mkspecs/macx-g++/Info.plist.app +share/qt4/mkspecs/macx-g++/Info.plist.lib +share/qt4/mkspecs/macx-g++/qmake.conf +share/qt4/mkspecs/macx-g++/qplatformdefs.h +share/qt4/mkspecs/macx-g++42/Info.plist.app +share/qt4/mkspecs/macx-g++42/Info.plist.lib +share/qt4/mkspecs/macx-g++42/qmake.conf +share/qt4/mkspecs/macx-g++42/qplatformdefs.h +share/qt4/mkspecs/macx-icc/qmake.conf +share/qt4/mkspecs/macx-icc/qplatformdefs.h +share/qt4/mkspecs/macx-llvm/Info.plist.app +share/qt4/mkspecs/macx-llvm/Info.plist.lib +share/qt4/mkspecs/macx-llvm/qmake.conf +share/qt4/mkspecs/macx-llvm/qplatformdefs.h +share/qt4/mkspecs/macx-pbuilder/Info.plist.app +share/qt4/mkspecs/macx-pbuilder/qmake.conf +share/qt4/mkspecs/macx-pbuilder/qplatformdefs.h +share/qt4/mkspecs/macx-xcode/Info.plist.app +share/qt4/mkspecs/macx-xcode/Info.plist.lib +share/qt4/mkspecs/macx-xcode/qmake.conf +share/qt4/mkspecs/macx-xcode/qplatformdefs.h +share/qt4/mkspecs/macx-xlc/qmake.conf +share/qt4/mkspecs/macx-xlc/qplatformdefs.h +share/qt4/mkspecs/netbsd-g++/qmake.conf +share/qt4/mkspecs/netbsd-g++/qplatformdefs.h +share/qt4/mkspecs/openbsd-g++/qmake.conf +share/qt4/mkspecs/openbsd-g++/qplatformdefs.h +share/qt4/mkspecs/qws/freebsd-generic-g++/qmake.conf +share/qt4/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-arm-g++/qmake.conf +share/qt4/mkspecs/qws/linux-arm-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-armv6-g++/qmake.conf +share/qt4/mkspecs/qws/linux-armv6-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-avr32-g++/qmake.conf +share/qt4/mkspecs/qws/linux-avr32-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-cellon-g++/qmake.conf +share/qt4/mkspecs/qws/linux-cellon-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-dm7000-g++/qmake.conf +share/qt4/mkspecs/qws/linux-dm7000-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-dm800-g++/qmake.conf +share/qt4/mkspecs/qws/linux-dm800-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-generic-g++-32/qmake.conf +share/qt4/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h +share/qt4/mkspecs/qws/linux-generic-g++/qmake.conf +share/qt4/mkspecs/qws/linux-generic-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-ipaq-g++/qmake.conf +share/qt4/mkspecs/qws/linux-ipaq-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-lsb-g++/qmake.conf +share/qt4/mkspecs/qws/linux-lsb-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-mips-g++/qmake.conf +share/qt4/mkspecs/qws/linux-mips-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-ppc-g++/qmake.conf +share/qt4/mkspecs/qws/linux-ppc-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-sh-g++/qmake.conf +share/qt4/mkspecs/qws/linux-sh-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-sh4al-g++/qmake.conf +share/qt4/mkspecs/qws/linux-sh4al-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-sharp-g++/qmake.conf +share/qt4/mkspecs/qws/linux-sharp-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-x86-g++/qmake.conf +share/qt4/mkspecs/qws/linux-x86-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-x86_64-g++/qmake.conf +share/qt4/mkspecs/qws/linux-x86_64-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-zylonite-g++/qmake.conf +share/qt4/mkspecs/qws/linux-zylonite-g++/qplatformdefs.h +share/qt4/mkspecs/qws/macx-generic-g++/qmake.conf +share/qt4/mkspecs/qws/macx-generic-g++/qplatformdefs.h +share/qt4/mkspecs/qws/solaris-generic-g++/qmake.conf +share/qt4/mkspecs/qws/solaris-generic-g++/qplatformdefs.h +share/qt4/mkspecs/sco-cc/qmake.conf +share/qt4/mkspecs/sco-cc/qplatformdefs.h +share/qt4/mkspecs/sco-g++/qmake.conf +share/qt4/mkspecs/sco-g++/qplatformdefs.h +share/qt4/mkspecs/solaris-cc-64/qmake.conf +share/qt4/mkspecs/solaris-cc-64/qplatformdefs.h +share/qt4/mkspecs/solaris-cc/qmake.conf +share/qt4/mkspecs/solaris-cc/qplatformdefs.h +share/qt4/mkspecs/solaris-g++-64/qmake.conf +share/qt4/mkspecs/solaris-g++-64/qplatformdefs.h +share/qt4/mkspecs/solaris-g++/qmake.conf +share/qt4/mkspecs/solaris-g++/qplatformdefs.h +share/qt4/mkspecs/tru64-cxx/qmake.conf +share/qt4/mkspecs/tru64-cxx/qplatformdefs.h +share/qt4/mkspecs/tru64-g++/qmake.conf +share/qt4/mkspecs/tru64-g++/qplatformdefs.h +share/qt4/mkspecs/unixware-cc/qmake.conf +share/qt4/mkspecs/unixware-cc/qplatformdefs.h +share/qt4/mkspecs/unixware-g++/qmake.conf +share/qt4/mkspecs/unixware-g++/qplatformdefs.h +share/qt4/mkspecs/win32-borland/qmake.conf +share/qt4/mkspecs/win32-borland/qplatformdefs.h +share/qt4/mkspecs/win32-g++/qmake.conf +share/qt4/mkspecs/win32-g++/qplatformdefs.h +share/qt4/mkspecs/win32-icc/qmake.conf +share/qt4/mkspecs/win32-icc/qplatformdefs.h +share/qt4/mkspecs/win32-msvc.net/qmake.conf +share/qt4/mkspecs/win32-msvc.net/qplatformdefs.h +share/qt4/mkspecs/win32-msvc/features/incremental.prf +share/qt4/mkspecs/win32-msvc/features/incremental_off.prf +share/qt4/mkspecs/win32-msvc/qmake.conf +share/qt4/mkspecs/win32-msvc/qplatformdefs.h +share/qt4/mkspecs/win32-msvc2002/qmake.conf +share/qt4/mkspecs/win32-msvc2002/qplatformdefs.h +share/qt4/mkspecs/win32-msvc2003/qmake.conf +share/qt4/mkspecs/win32-msvc2003/qplatformdefs.h +share/qt4/mkspecs/win32-msvc2005/qmake.conf +share/qt4/mkspecs/win32-msvc2005/qplatformdefs.h +share/qt4/mkspecs/win32-msvc2008/qmake.conf +share/qt4/mkspecs/win32-msvc2008/qplatformdefs.h +share/qt4/mkspecs/wince50standard-armv4i-msvc2005/default_post.prf +share/qt4/mkspecs/wince50standard-armv4i-msvc2005/qmake.conf +share/qt4/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h +share/qt4/mkspecs/wince50standard-armv4i-msvc2008/default_post.prf +share/qt4/mkspecs/wince50standard-armv4i-msvc2008/qmake.conf +share/qt4/mkspecs/wince50standard-armv4i-msvc2008/qplatformdefs.h +share/qt4/mkspecs/wince50standard-mipsii-msvc2005/default_post.prf +share/qt4/mkspecs/wince50standard-mipsii-msvc2005/qmake.conf +share/qt4/mkspecs/wince50standard-mipsii-msvc2005/qplatformdefs.h +share/qt4/mkspecs/wince50standard-mipsii-msvc2008/default_post.prf +share/qt4/mkspecs/wince50standard-mipsii-msvc2008/qmake.conf +share/qt4/mkspecs/wince50standard-mipsii-msvc2008/qplatformdefs.h +share/qt4/mkspecs/wince50standard-mipsiv-msvc2005/qmake.conf +share/qt4/mkspecs/wince50standard-mipsiv-msvc2005/qplatformdefs.h +share/qt4/mkspecs/wince50standard-mipsiv-msvc2008/qmake.conf +share/qt4/mkspecs/wince50standard-mipsiv-msvc2008/qplatformdefs.h +share/qt4/mkspecs/wince50standard-sh4-msvc2005/qmake.conf +share/qt4/mkspecs/wince50standard-sh4-msvc2005/qplatformdefs.h +share/qt4/mkspecs/wince50standard-sh4-msvc2008/qmake.conf +share/qt4/mkspecs/wince50standard-sh4-msvc2008/qplatformdefs.h +share/qt4/mkspecs/wince50standard-x86-msvc2005/default_post.prf +share/qt4/mkspecs/wince50standard-x86-msvc2005/qmake.conf +share/qt4/mkspecs/wince50standard-x86-msvc2005/qplatformdefs.h +share/qt4/mkspecs/wince50standard-x86-msvc2008/default_post.prf +share/qt4/mkspecs/wince50standard-x86-msvc2008/qmake.conf +share/qt4/mkspecs/wince50standard-x86-msvc2008/qplatformdefs.h +share/qt4/mkspecs/wince60standard-armv4i-msvc2005/qmake.conf +share/qt4/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h +share/qt4/mkspecs/wincewm50pocket-msvc2005/default_post.prf +share/qt4/mkspecs/wincewm50pocket-msvc2005/qmake.conf +share/qt4/mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h +share/qt4/mkspecs/wincewm50pocket-msvc2008/default_post.prf +share/qt4/mkspecs/wincewm50pocket-msvc2008/qmake.conf +share/qt4/mkspecs/wincewm50pocket-msvc2008/qplatformdefs.h +share/qt4/mkspecs/wincewm50smart-msvc2005/default_post.prf +share/qt4/mkspecs/wincewm50smart-msvc2005/qmake.conf +share/qt4/mkspecs/wincewm50smart-msvc2005/qplatformdefs.h +share/qt4/mkspecs/wincewm50smart-msvc2008/default_post.prf +share/qt4/mkspecs/wincewm50smart-msvc2008/qmake.conf +share/qt4/mkspecs/wincewm50smart-msvc2008/qplatformdefs.h +share/qt4/mkspecs/wincewm60professional-msvc2005/default_post.prf +share/qt4/mkspecs/wincewm60professional-msvc2005/qmake.conf +share/qt4/mkspecs/wincewm60professional-msvc2005/qplatformdefs.h +share/qt4/mkspecs/wincewm60professional-msvc2008/default_post.prf +share/qt4/mkspecs/wincewm60professional-msvc2008/qmake.conf +share/qt4/mkspecs/wincewm60professional-msvc2008/qplatformdefs.h +share/qt4/mkspecs/wincewm60standard-msvc2005/default_post.prf +share/qt4/mkspecs/wincewm60standard-msvc2005/qmake.conf +share/qt4/mkspecs/wincewm60standard-msvc2005/qplatformdefs.h +share/qt4/mkspecs/wincewm60standard-msvc2008/default_post.prf +share/qt4/mkspecs/wincewm60standard-msvc2008/qmake.conf +share/qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h +@dirrm share/qt4/mkspecs/wincewm60standard-msvc2008 +@dirrm share/qt4/mkspecs/wincewm60standard-msvc2005 +@dirrm share/qt4/mkspecs/wincewm60professional-msvc2008 +@dirrm share/qt4/mkspecs/wincewm60professional-msvc2005 +@dirrm share/qt4/mkspecs/wincewm50smart-msvc2008 +@dirrm share/qt4/mkspecs/wincewm50smart-msvc2005 +@dirrm share/qt4/mkspecs/wincewm50pocket-msvc2008 +@dirrm share/qt4/mkspecs/wincewm50pocket-msvc2005 +@dirrm share/qt4/mkspecs/wince60standard-armv4i-msvc2005 +@dirrm share/qt4/mkspecs/wince50standard-x86-msvc2008 +@dirrm share/qt4/mkspecs/wince50standard-x86-msvc2005 +@dirrm share/qt4/mkspecs/wince50standard-sh4-msvc2008 +@dirrm share/qt4/mkspecs/wince50standard-sh4-msvc2005 +@dirrm share/qt4/mkspecs/wince50standard-mipsiv-msvc2008 +@dirrm share/qt4/mkspecs/wince50standard-mipsiv-msvc2005 +@dirrm share/qt4/mkspecs/wince50standard-mipsii-msvc2008 +@dirrm share/qt4/mkspecs/wince50standard-mipsii-msvc2005 +@dirrm share/qt4/mkspecs/wince50standard-armv4i-msvc2008 +@dirrm share/qt4/mkspecs/wince50standard-armv4i-msvc2005 +@dirrm share/qt4/mkspecs/win32-msvc2008 +@dirrm share/qt4/mkspecs/win32-msvc2005 +@dirrm share/qt4/mkspecs/win32-msvc2003 +@dirrm share/qt4/mkspecs/win32-msvc2002 +@dirrm share/qt4/mkspecs/win32-msvc/features +@dirrm share/qt4/mkspecs/win32-msvc.net +@dirrm share/qt4/mkspecs/win32-msvc +@dirrm share/qt4/mkspecs/win32-icc +@dirrm share/qt4/mkspecs/win32-g++ +@dirrm share/qt4/mkspecs/win32-borland +@dirrm share/qt4/mkspecs/unixware-g++ +@dirrm share/qt4/mkspecs/unixware-cc +@dirrm share/qt4/mkspecs/tru64-g++ +@dirrm share/qt4/mkspecs/tru64-cxx +@dirrm share/qt4/mkspecs/solaris-g++-64 +@dirrm share/qt4/mkspecs/solaris-g++ +@dirrm share/qt4/mkspecs/solaris-cc-64 +@dirrm share/qt4/mkspecs/solaris-cc +@dirrm share/qt4/mkspecs/sco-g++ +@dirrm share/qt4/mkspecs/sco-cc +@dirrm share/qt4/mkspecs/qws/solaris-generic-g++ +@dirrm share/qt4/mkspecs/qws/macx-generic-g++ +@dirrm share/qt4/mkspecs/qws/linux-zylonite-g++ +@dirrm share/qt4/mkspecs/qws/linux-x86_64-g++ +@dirrm share/qt4/mkspecs/qws/linux-x86-g++ +@dirrm share/qt4/mkspecs/qws/linux-sharp-g++ +@dirrm share/qt4/mkspecs/qws/linux-sh4al-g++ +@dirrm share/qt4/mkspecs/qws/linux-sh-g++ +@dirrm share/qt4/mkspecs/qws/linux-ppc-g++ +@dirrm share/qt4/mkspecs/qws/linux-mips-g++ +@dirrm share/qt4/mkspecs/qws/linux-lsb-g++ +@dirrm share/qt4/mkspecs/qws/linux-ipaq-g++ +@dirrm share/qt4/mkspecs/qws/linux-generic-g++-32 +@dirrm share/qt4/mkspecs/qws/linux-generic-g++ +@dirrm share/qt4/mkspecs/qws/linux-dm800-g++ +@dirrm share/qt4/mkspecs/qws/linux-dm7000-g++ +@dirrm share/qt4/mkspecs/qws/linux-cellon-g++ +@dirrm share/qt4/mkspecs/qws/linux-avr32-g++ +@dirrm share/qt4/mkspecs/qws/linux-armv6-g++ +@dirrm share/qt4/mkspecs/qws/linux-arm-g++ +@dirrm share/qt4/mkspecs/qws/freebsd-generic-g++ +@dirrm share/qt4/mkspecs/qws +@dirrm share/qt4/mkspecs/openbsd-g++ +@dirrm share/qt4/mkspecs/netbsd-g++ +@dirrm share/qt4/mkspecs/macx-xlc +@dirrm share/qt4/mkspecs/macx-xcode +@dirrm share/qt4/mkspecs/macx-pbuilder +@dirrm share/qt4/mkspecs/macx-llvm +@dirrm share/qt4/mkspecs/macx-icc +@dirrm share/qt4/mkspecs/macx-g++42 +@dirrm share/qt4/mkspecs/macx-g++ +@dirrm share/qt4/mkspecs/lynxos-g++ +@dirrm share/qt4/mkspecs/linux-pgcc +@dirrm share/qt4/mkspecs/linux-lsb-g++ +@dirrm share/qt4/mkspecs/linux-llvm +@dirrm share/qt4/mkspecs/linux-kcc +@dirrm share/qt4/mkspecs/linux-icc-64 +@dirrm share/qt4/mkspecs/linux-icc-32 +@dirrm share/qt4/mkspecs/linux-icc +@dirrm share/qt4/mkspecs/linux-g++-64 +@dirrm share/qt4/mkspecs/linux-g++-32 +@dirrm share/qt4/mkspecs/linux-g++ +@dirrm share/qt4/mkspecs/linux-ecc-64 +@dirrm share/qt4/mkspecs/linux-cxx +@dirrm share/qt4/mkspecs/irix-g++-64 +@dirrm share/qt4/mkspecs/irix-g++ +@dirrm share/qt4/mkspecs/irix-cc-64 +@dirrm share/qt4/mkspecs/irix-cc +@dirrm share/qt4/mkspecs/hurd-g++ +@dirrm share/qt4/mkspecs/hpuxi-g++-64 +@dirrm share/qt4/mkspecs/hpuxi-acc-64 +@dirrm share/qt4/mkspecs/hpuxi-acc-32 +@dirrm share/qt4/mkspecs/hpux-g++-64 +@dirrm share/qt4/mkspecs/hpux-g++ +@dirrm share/qt4/mkspecs/hpux-acc-o64 +@dirrm share/qt4/mkspecs/hpux-acc-64 +@dirrm share/qt4/mkspecs/hpux-acc +@dirrm share/qt4/mkspecs/freebsd-icc +@dirrm share/qt4/mkspecs/freebsd-g++40 +@dirrm share/qt4/mkspecs/freebsd-g++34 +@dirrm share/qt4/mkspecs/freebsd-g++ +@dirrm share/qt4/mkspecs/features/win32 +@dirrm share/qt4/mkspecs/features/unix +@dirrm share/qt4/mkspecs/features/mac +@dirrmtry share/qt4/mkspecs/features +@dirrm share/qt4/mkspecs/darwin-g++ +@dirrm share/qt4/mkspecs/cygwin-g++ +@dirrm share/qt4/mkspecs/common +@dirrm share/qt4/mkspecs/aix-xlc-64 +@dirrm share/qt4/mkspecs/aix-xlc +@dirrm share/qt4/mkspecs/aix-g++-64 +@dirrm share/qt4/mkspecs/aix-g++ +@dirrmtry share/qt4/mkspecs +@dirrmtry share/qt4 diff --git a/devel/qt4-assistant-adp/Makefile b/devel/qt4-assistant-adp/Makefile index 4ce95474d375..cad3d9efc982 100644 --- a/devel/qt4-assistant-adp/Makefile +++ b/devel/qt4-assistant-adp/Makefile @@ -22,6 +22,7 @@ QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib \ gui network xml doc dbus QT_NONSTANDARD= yes QT_DIST= yes +MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes diff --git a/devel/qt4-assistant-adp/distinfo b/devel/qt4-assistant-adp/distinfo index 1756af8b04d9..27b0949354e8 100644 --- a/devel/qt4-assistant-adp/distinfo +++ b/devel/qt4-assistant-adp/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile index 898bd6293299..93e6a1a77475 100644 --- a/devel/qt4-assistant/Makefile +++ b/devel/qt4-assistant/Makefile @@ -20,9 +20,10 @@ COMMENT= Qt documentation browser USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build rcc_build uic_build qt3support corelib \ - gui network sql xml doc help + gui network sql xml doc help webkit QT_NONSTANDARD= yes QT_DIST= yes +MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes @@ -35,7 +36,7 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/dbus src/opengl src/phonon \ src/qt3support src/script src/svg src/testlib \ src/tools src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/3rdparty/kdebase src/3rdparty/kdelibs EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' diff --git a/devel/qt4-assistant/distinfo b/devel/qt4-assistant/distinfo index 1756af8b04d9..27b0949354e8 100644 --- a/devel/qt4-assistant/distinfo +++ b/devel/qt4-assistant/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile index 417f4f220adf..4d1b4c6f1246 100644 --- a/devel/qt4-corelib/Makefile +++ b/devel/qt4-corelib/Makefile @@ -24,10 +24,12 @@ USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build QT_NONSTANDARD= yes QT_DIST= yes +MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/qt4 + ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ @@ -47,13 +49,21 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME} CONFIGURE_WRKSRC=${WRKSRC}/../../ PATCH_WRKSRC=${CONFIGURE_WRKSRC} -.include <bsd.port.pre.mk> +EXTRA_PATCHES=${.CURDIR}/../../devel/qt4/files/extrapatch-configure + +.include "${.CURDIR}/../../devel/qt4/files/Makefile.options" + +pre-everything:: + @${CAT} ${PKGMESSAGE} + +post-patch: + ${REINPLACE_CMD} -e '${QT4_OPTIONS_REPLACE}' ${CONFIGURE_WRKSRC}/configure pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${MKDIR} ${WRKSRC}/../../mkspecs ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc + post-configure: ${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' ${WRKSRC}/Makefile @@ -61,17 +71,10 @@ post-configure: -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ ${WRKSRC}/../../lib/pkgconfig/QtCore.pc - #hack to hard-code the feature part of qconfig.h - ${HEAD} -n 27 ${WRKSRC}/global/qconfig.h > ${WRKDIR}/qconfig.tmp - ${CHMOD} 644 ${WRKSRC}/global/qconfig.h - ${CAT} ${WRKDIR}/qconfig.tmp ${FILESDIR}/qconfig.h.in > ${WRKSRC}/global/qconfig.h -.if ${OSVERSION} >= 700042 - ${ECHO_CMD} "#define QT_VISIBILITY_AVAILABLE" >> ${WRKSRC}/global/qconfig.h -.endif post-install: ${MKDIR} ${PREFIX}/lib/qt4/plugins ${TOUCH} ${PREFIX}/lib/qt4/plugins/.keep_me ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/mkspecs/qconfig.pri ${PREFIX}/share/qt4/mkspecs/ -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/qt4-corelib/distinfo b/devel/qt4-corelib/distinfo index 1756af8b04d9..27b0949354e8 100644 --- a/devel/qt4-corelib/distinfo +++ b/devel/qt4-corelib/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/qt4-corelib/files/patch-src__corelib__codecs__qiconvcodec.cpp b/devel/qt4-corelib/files/patch-src__corelib__codecs__qiconvcodec.cpp new file mode 100644 index 000000000000..31c291b6928f --- /dev/null +++ b/devel/qt4-corelib/files/patch-src__corelib__codecs__qiconvcodec.cpp @@ -0,0 +1,11 @@ +--- ./src/corelib/codecs/qiconvcodec.cpp.orig 2009-06-20 08:57:57.000000000 +0400 ++++ ./src/corelib/codecs/qiconvcodec.cpp 2009-07-01 23:12:06.000000000 +0400 +@@ -62,7 +62,7 @@ + #elif defined(Q_OS_AIX) + # define NO_BOM + # define UTF16 "UCS-2" +-#elif defined(Q_OS_MAC) ++#elif defined(Q_OS_MAC) || defined(Q_OS_FREEBSD) + # define NO_BOM + # if Q_BYTE_ORDER == Q_BIG_ENDIAN + # define UTF16 "UTF-16BE" diff --git a/devel/qt4-corelib/files/qconfig.h.in b/devel/qt4-corelib/files/qconfig.h.in deleted file mode 100644 index 5e17437dbff8..000000000000 --- a/devel/qt4-corelib/files/qconfig.h.in +++ /dev/null @@ -1,42 +0,0 @@ -#if defined(QT_NO_CLOCK_MONOTONIC) && defined(QT_CLOCK_MONOTONIC) -# undef QT_NO_CLOCK_MONOTONIC -#elif !defined(QT_NO_CLOCK_MONOTONIC) && !defined(QT_CLOCK_MONOTONIC) -# define QT_NO_CLOCK_MONOTONIC -#endif - -#if defined(QT_NO_EXCEPTIONS) && defined(QT_EXCEPTIONS) -# undef QT_NO_EXCEPTIONS -#elif !defined(QT_NO_EXCEPTIONS) && !defined(QT_EXCEPTIONS) -# define QT_NO_EXCEPTIONS -#endif - -#if defined(QT_NO_INOTIFY) && defined(QT_INOTIFY) -# undef QT_NO_INOTIFY -#elif !defined(QT_NO_INOTIFY) && !defined(QT_INOTIFY) -# define QT_NO_INOTIFY -#endif - -#if defined(QT_NO_MREMAP) && defined(QT_MREMAP) -# undef QT_NO_MREMAP -#elif !defined(QT_NO_MREMAP) && !defined(QT_MREMAP) -# define QT_NO_MREMAP -#endif - -#if defined(QT_NO_NAS) && defined(QT_NAS) -# undef QT_NO_NAS -#elif !defined(QT_NO_NAS) && !defined(QT_NAS) -# define QT_NO_NAS -#endif - -#if defined(QT_NO_SXE) && defined(QT_SXE) -# undef QT_NO_SXE -#elif !defined(QT_NO_SXE) && !defined(QT_SXE) -# define QT_NO_SXE -#endif - -#if defined(QT_USE_MATH_H_FLOATS) && defined(QT_NO_USE_MATH_H_FLOATS) -# undef QT_USE_MATH_H_FLOATS -#elif !defined(QT_USE_MATH_H_FLOATS) && !defined(QT_NO_USE_MATH_H_FLOATS) -# define QT_USE_MATH_H_FLOATS -#endif - diff --git a/devel/qt4-corelib/pkg-message b/devel/qt4-corelib/pkg-message new file mode 100644 index 000000000000..73e2b9581e01 --- /dev/null +++ b/devel/qt4-corelib/pkg-message @@ -0,0 +1,16 @@ +===================================================================== + +Qt4 can be built with optional support for: + - Common UNIX Printing System (CUPS) + - Network Audio System (NAS) + - Qt style that renders using GTK (QGTKSTYLE) + +In order to enable them, you need add + QT4_OPTIONS= CUPS NAS QGTKSTYLE +to your /etc/make.conf and compile devel/qt4-corelib and +x11-toolkits/qt4-gui ports. + +Attention! Whenever you change the QT4_OPTIONS both +devel/qt4-corelib and x11-toolkits/qt4-gui ports must be rebuilt! + +===================================================================== diff --git a/devel/qt4-corelib/pkg-plist b/devel/qt4-corelib/pkg-plist index 6d0f8697965d..60ae94ef4c3b 100644 --- a/devel/qt4-corelib/pkg-plist +++ b/devel/qt4-corelib/pkg-plist @@ -7,6 +7,7 @@ include/qt4/Qt/qatomic.h include/qt4/Qt/qatomic_alpha.h include/qt4/Qt/qatomic_arch.h include/qt4/Qt/qatomic_arm.h +include/qt4/Qt/qatomic_armv6.h include/qt4/Qt/qatomic_avr32.h include/qt4/Qt/qatomic_bfin.h include/qt4/Qt/qatomic_bootstrap.h @@ -17,6 +18,8 @@ include/qt4/Qt/qatomic_mips.h include/qt4/Qt/qatomic_parisc.h include/qt4/Qt/qatomic_powerpc.h include/qt4/Qt/qatomic_s390.h +include/qt4/Qt/qatomic_sh.h +include/qt4/Qt/qatomic_sh4a.h include/qt4/Qt/qatomic_sparc.h include/qt4/Qt/qatomic_x86_64.h include/qt4/Qt/qbasicatomic.h @@ -92,6 +95,8 @@ include/qt4/Qt/qset.h include/qt4/Qt/qsettings.h include/qt4/Qt/qshareddata.h include/qt4/Qt/qsharedmemory.h +include/qt4/Qt/qsharedpointer.h +include/qt4/Qt/qsharedpointer_impl.h include/qt4/Qt/qsignalmapper.h include/qt4/Qt/qsize.h include/qt4/Qt/qsocketnotifier.h @@ -201,6 +206,7 @@ include/qt4/QtCore/QHashDummyValue include/qt4/QtCore/QHashIterator include/qt4/QtCore/QHashNode include/qt4/QtCore/QIODevice +include/qt4/QtCore/QIncompatibleFlag include/qt4/QtCore/QIntForSize include/qt4/QtCore/QIntForType include/qt4/QtCore/QInternal @@ -221,10 +227,13 @@ include/qt4/QtCore/QLocale include/qt4/QtCore/QMap include/qt4/QtCore/QMapData include/qt4/QtCore/QMapIterator +include/qt4/QtCore/QMapNode +include/qt4/QtCore/QMapPayloadNode include/qt4/QtCore/QMetaClassInfo include/qt4/QtCore/QMetaEnum include/qt4/QtCore/QMetaMethod include/qt4/QtCore/QMetaObject +include/qt4/QtCore/QMetaObjectExtraData include/qt4/QtCore/QMetaProperty include/qt4/QtCore/QMetaType include/qt4/QtCore/QMetaTypeId @@ -274,6 +283,7 @@ include/qt4/QtCore/QSettings include/qt4/QtCore/QSharedData include/qt4/QtCore/QSharedDataPointer include/qt4/QtCore/QSharedMemory +include/qt4/QtCore/QSharedPointer include/qt4/QtCore/QSignalMapper include/qt4/QtCore/QSize include/qt4/QtCore/QSizeF @@ -318,6 +328,7 @@ include/qt4/QtCore/QUuid include/qt4/QtCore/QVarLengthArray include/qt4/QtCore/QVariant include/qt4/QtCore/QVariantComparisonHelper +include/qt4/QtCore/QVariantHash include/qt4/QtCore/QVariantList include/qt4/QtCore/QVariantMap include/qt4/QtCore/QVector @@ -325,6 +336,7 @@ include/qt4/QtCore/QVectorData include/qt4/QtCore/QVectorIterator include/qt4/QtCore/QVectorTypedData include/qt4/QtCore/QWaitCondition +include/qt4/QtCore/QWeakPointer include/qt4/QtCore/QWriteLocker include/qt4/QtCore/QXmlStreamAttribute include/qt4/QtCore/QXmlStreamAttributes @@ -373,6 +385,7 @@ include/qt4/QtCore/qatomic.h include/qt4/QtCore/qatomic_alpha.h include/qt4/QtCore/qatomic_arch.h include/qt4/QtCore/qatomic_arm.h +include/qt4/QtCore/qatomic_armv6.h include/qt4/QtCore/qatomic_avr32.h include/qt4/QtCore/qatomic_bfin.h include/qt4/QtCore/qatomic_bootstrap.h @@ -383,6 +396,8 @@ include/qt4/QtCore/qatomic_mips.h include/qt4/QtCore/qatomic_parisc.h include/qt4/QtCore/qatomic_powerpc.h include/qt4/QtCore/qatomic_s390.h +include/qt4/QtCore/qatomic_sh.h +include/qt4/QtCore/qatomic_sh4a.h include/qt4/QtCore/qatomic_sparc.h include/qt4/QtCore/qatomic_x86_64.h include/qt4/QtCore/qbasicatomic.h @@ -458,6 +473,8 @@ include/qt4/QtCore/qset.h include/qt4/QtCore/qsettings.h include/qt4/QtCore/qshareddata.h include/qt4/QtCore/qsharedmemory.h +include/qt4/QtCore/qsharedpointer.h +include/qt4/QtCore/qsharedpointer_impl.h include/qt4/QtCore/qsignalmapper.h include/qt4/QtCore/qsize.h include/qt4/QtCore/qsocketnotifier.h @@ -503,9 +520,9 @@ lib/qt4/libQtCore.la lib/qt4/libQtCore.prl lib/qt4/libQtCore.so lib/qt4/libQtCore.so.4 -lib/qt4/libQtCore.so.4.4 -%%DEBUG%%lib/qt4/libQtCore.so.4.4.3.debug -lib/qt4/libQtCore.so.4.4.3 +lib/qt4/libQtCore.so.4.5 +lib/qt4/libQtCore.so.4.5.2 +%%DEBUG%%lib/qt4/libQtCore.so.4.5.2.debug lib/qt4/plugins/.keep_me libdata/pkgconfig/QtCore.pc share/qt4/mkspecs/qconfig.pri diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile index e6b38e04e12a..7cff683f867b 100644 --- a/devel/qt4-designer/Makefile +++ b/devel/qt4-designer/Makefile @@ -23,6 +23,7 @@ QT_COMPONENTS= qmake_build moc_build rcc_build uic_build assistant_run \ qt3support corelib gui network script sql xml webkit QT_NONSTANDARD= yes QT_DIST= yes +MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/qt4 @@ -32,7 +33,7 @@ CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ - src/dbus src/opengl src/phonon \ + src/dbus src/opengl \ src/sql src/svg src/testlib \ src/xmlpatterns src/3rdparty/clucene \ src/3rdparty/kdebase src/3rdparty/kdelibs diff --git a/devel/qt4-designer/distinfo b/devel/qt4-designer/distinfo index 1756af8b04d9..27b0949354e8 100644 --- a/devel/qt4-designer/distinfo +++ b/devel/qt4-designer/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/qt4-designer/pkg-plist b/devel/qt4-designer/pkg-plist index 595394706758..dd780a44e740 100644 --- a/devel/qt4-designer/pkg-plist +++ b/devel/qt4-designer/pkg-plist @@ -85,17 +85,18 @@ include/qt4/QtUiTools/quiloader.h lib/qt4/libQtDesigner.prl lib/qt4/libQtDesigner.so lib/qt4/libQtDesigner.so.4 -lib/qt4/libQtDesigner.so.4.4 -lib/qt4/libQtDesigner.so.4.4.3 -%%DEBUG%%lib/qt4/libQtDesigner.so.4.4.3.debug +lib/qt4/libQtDesigner.so.4.5 +lib/qt4/libQtDesigner.so.4.5.2 +%%DEBUG%%lib/qt4/libQtDesigner.so.4.5.2.debug lib/qt4/libQtDesignerComponents.prl lib/qt4/libQtDesignerComponents.so lib/qt4/libQtDesignerComponents.so.4 -lib/qt4/libQtDesignerComponents.so.4.4 -lib/qt4/libQtDesignerComponents.so.4.4.3 -%%DEBUG%%lib/qt4/libQtDesignerComponents.so.4.4.3.debug +lib/qt4/libQtDesignerComponents.so.4.5 +lib/qt4/libQtDesignerComponents.so.4.5.2 +%%DEBUG%%lib/qt4/libQtDesignerComponents.so.4.5.2.debug lib/qt4/libQtUiTools.a lib/qt4/libQtUiTools.prl +lib/qt4/plugins/designer/libphononwidgets.so lib/qt4/plugins/designer/libqt3supportwidgets.so %%DEBUG%%lib/qt4/plugins/designer/libqt3supportwidgets.so.debug lib/qt4/plugins/designer/libqwebview.so diff --git a/devel/qt4-help-tools/Makefile b/devel/qt4-help-tools/Makefile index b7da49f05cc4..0670c45d26ed 100644 --- a/devel/qt4-help-tools/Makefile +++ b/devel/qt4-help-tools/Makefile @@ -22,6 +22,7 @@ QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib \ gui sql xml doc help QT_NONSTANDARD= yes QT_DIST= yes +MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes diff --git a/devel/qt4-help-tools/distinfo b/devel/qt4-help-tools/distinfo index 1756af8b04d9..27b0949354e8 100644 --- a/devel/qt4-help-tools/distinfo +++ b/devel/qt4-help-tools/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/qt4-help/Makefile b/devel/qt4-help/Makefile index 11ee4f9c5e58..9ab4e6d2e54b 100644 --- a/devel/qt4-help/Makefile +++ b/devel/qt4-help/Makefile @@ -20,6 +20,7 @@ USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build rcc_build corelib clucene gui sql xml network QT_NONSTANDARD= yes QT_DIST= yes +MAKE_JOBS_SAFE= yes RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlite.so:${PORTSDIR}/databases/qt4-sqlite3-plugin diff --git a/devel/qt4-help/distinfo b/devel/qt4-help/distinfo index 1756af8b04d9..27b0949354e8 100644 --- a/devel/qt4-help/distinfo +++ b/devel/qt4-help/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/qt4-help/pkg-plist b/devel/qt4-help/pkg-plist index d239d1bef055..b99df3fe03b9 100644 --- a/devel/qt4-help/pkg-plist +++ b/devel/qt4-help/pkg-plist @@ -32,9 +32,9 @@ lib/qt4/libQtHelp.la lib/qt4/libQtHelp.prl lib/qt4/libQtHelp.so lib/qt4/libQtHelp.so.4 -lib/qt4/libQtHelp.so.4.4 -lib/qt4/libQtHelp.so.4.4.3 -%%DEBUG%%lib/qt4/libQtHelp.so.4.4.3.debug +lib/qt4/libQtHelp.so.4.5 +lib/qt4/libQtHelp.so.4.5.2 +%%DEBUG%%lib/qt4/libQtHelp.so.4.5.2.debug libdata/pkgconfig/QtHelp.pc @dirrm include/qt4/QtHelp @dirrmtry include/qt4/Qt diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile index 53956275d204..a8af9a0ae92d 100644 --- a/devel/qt4-libqtassistantclient/Makefile +++ b/devel/qt4-libqtassistantclient/Makefile @@ -22,6 +22,7 @@ USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build rcc_build corelib gui network QT_NONSTANDARD= yes QT_DIST= yes +MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/qt4-libqtassistantclient/distinfo b/devel/qt4-libqtassistantclient/distinfo index 1756af8b04d9..27b0949354e8 100644 --- a/devel/qt4-libqtassistantclient/distinfo +++ b/devel/qt4-libqtassistantclient/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/qt4-libqtassistantclient/pkg-plist b/devel/qt4-libqtassistantclient/pkg-plist index beef7b55f9bb..eaeab429c967 100644 --- a/devel/qt4-libqtassistantclient/pkg-plist +++ b/devel/qt4-libqtassistantclient/pkg-plist @@ -5,8 +5,8 @@ include/qt4/QtAssistant/qassistantclient_global.h lib/qt4/libQtAssistantClient.prl lib/qt4/libQtAssistantClient.so lib/qt4/libQtAssistantClient.so.4 -lib/qt4/libQtAssistantClient.so.4.4 -lib/qt4/libQtAssistantClient.so.4.4.3 -%%DEBUG%%lib/qt4/libQtAssistantClient.so.4.4.3.debug +lib/qt4/libQtAssistantClient.so.4.5 +lib/qt4/libQtAssistantClient.so.4.5.2 +%%DEBUG%%lib/qt4/libQtAssistantClient.so.4.5.2.debug libdata/pkgconfig/QtAssistantClient.pc @dirrm include/qt4/QtAssistant diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile index 863946643ceb..014d954be5d4 100644 --- a/devel/qt4-linguist/Makefile +++ b/devel/qt4-linguist/Makefile @@ -23,6 +23,7 @@ QT_COMPONENTS= qmake_build designer_build moc_build rcc_build uic_build \ assistant_run gui network xml QT_NONSTANDARD= yes QT_DIST= yes +MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes diff --git a/devel/qt4-linguist/distinfo b/devel/qt4-linguist/distinfo index 1756af8b04d9..27b0949354e8 100644 --- a/devel/qt4-linguist/distinfo +++ b/devel/qt4-linguist/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/qt4-linguist/files/patch-0185-fix-format-strings.diff b/devel/qt4-linguist/files/patch-0185-fix-format-strings.diff deleted file mode 100644 index ac6f68210fe1..000000000000 --- a/devel/qt4-linguist/files/patch-0185-fix-format-strings.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- tools/linguist/shared/profileevaluator.h.orig 2008-04-28 09:11:21.000000000 -0400 -+++ tools/linguist/shared/profileevaluator.h 2008-05-09 10:50:40.000000000 -0400 -@@ -112,7 +112,12 @@ - private: - QStringList expandPattern(const QString &pattern); - void logMessage(const QString &msg, MessageType mt = MT_DebugLevel2); -- void logMessage(MessageType mt, const char *msg, ...); -+ void logMessage(MessageType mt, const char *msg, ...) -+#if defined(Q_CC_GNU) && !defined(__INSURE__) -+ __attribute__ ((format (printf, 3, 4))) -+#endif -+ ; -+ - QStringList expandVariableReferences(const QString &value); - QStringList evaluateExpandFunction(const QByteArray &func, const QString &arguments); - diff --git a/devel/qt4-linguist/files/patch-tools__linguist__linguist__trwindow.cpp b/devel/qt4-linguist/files/patch-tools__linguist__linguist__trwindow.cpp deleted file mode 100644 index 7535c1c2633b..000000000000 --- a/devel/qt4-linguist/files/patch-tools__linguist__linguist__trwindow.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ./tools/linguist/linguist/trwindow.cpp.orig 2008-04-28 17:11:21.000000000 +0400 -+++ ./tools/linguist/linguist/trwindow.cpp 2008-06-17 01:02:02.000000000 +0400 -@@ -939,7 +939,7 @@ - if (m_assistantProcess->state() != QProcess::Running) { - QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator(); - #if !defined(Q_OS_MAC) -- app += QLatin1String("assistant"); -+ app += QLatin1String("assistant-qt4"); - #else - app += QLatin1String("Assistant.app/Contents/MacOS/Assistant"); - #endif diff --git a/devel/qt4-linguist/pkg-plist b/devel/qt4-linguist/pkg-plist index f638e7cc76d4..72b61be39f1d 100644 --- a/devel/qt4-linguist/pkg-plist +++ b/devel/qt4-linguist/pkg-plist @@ -1,3 +1,5 @@ +bin/lconvert +%%DEBUG%%bin/lconvert.debug bin/linguist-qt4 %%DEBUG%%bin/linguist-qt4.debug bin/lrelease-qt4 diff --git a/devel/qt4-makeqpf/Makefile b/devel/qt4-makeqpf/Makefile index 01b0e79317f8..f4c8af520910 100644 --- a/devel/qt4-makeqpf/Makefile +++ b/devel/qt4-makeqpf/Makefile @@ -22,6 +22,7 @@ USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib gui QT_NONSTANDARD= yes QT_DIST= yes +MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes diff --git a/devel/qt4-makeqpf/distinfo b/devel/qt4-makeqpf/distinfo index 1756af8b04d9..27b0949354e8 100644 --- a/devel/qt4-makeqpf/distinfo +++ b/devel/qt4-makeqpf/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/qt4-moc/Makefile b/devel/qt4-moc/Makefile index b1f2cb433509..233166c11165 100644 --- a/devel/qt4-moc/Makefile +++ b/devel/qt4-moc/Makefile @@ -22,6 +22,7 @@ USE_QT_VER= 4 QT_COMPONENTS= qmake_build QT_NONSTANDARD= yes QT_DIST= yes +MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes @@ -33,7 +34,7 @@ MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/dbus src/gui src/network src/opengl \ src/phonon src/qt3support src/script src/sql src/svg \ - src/testlib src/xml src/xmlpatterns src/3rdparty/clucene \ + src/testlib src/xmlpatterns src/3rdparty/clucene \ src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} @@ -51,4 +52,7 @@ pre-configure: ${MKDIR} ${WRKSRC}/../../../mkspecs ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../bin/qmake +do-build: + cd ${CONFIGURE_WRKSRC}/src/tools/bootstrap/ && make + .include <bsd.port.mk> diff --git a/devel/qt4-moc/distinfo b/devel/qt4-moc/distinfo index 1756af8b04d9..27b0949354e8 100644 --- a/devel/qt4-moc/distinfo +++ b/devel/qt4-moc/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/qt4-porting/Makefile b/devel/qt4-porting/Makefile index 2f530db60987..43cbc4669a61 100644 --- a/devel/qt4-porting/Makefile +++ b/devel/qt4-porting/Makefile @@ -21,6 +21,7 @@ USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build rcc_build corelib xml QT_NONSTANDARD= yes QT_DIST= yes +MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes diff --git a/devel/qt4-porting/distinfo b/devel/qt4-porting/distinfo index 1756af8b04d9..27b0949354e8 100644 --- a/devel/qt4-porting/distinfo +++ b/devel/qt4-porting/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/qt4-qdbusviewer/Makefile b/devel/qt4-qdbusviewer/Makefile index 637f879d8873..2b3222ddccb2 100644 --- a/devel/qt4-qdbusviewer/Makefile +++ b/devel/qt4-qdbusviewer/Makefile @@ -21,9 +21,11 @@ COMMENT= Qt4 D-BUS viewer LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build rcc_build corelib dbus gui xml +QT_COMPONENTS= qmake_build moc_build rcc_build corelib dbus gui xml \ + clucene QT_NONSTANDARD= yes QT_DIST= yes +MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes @@ -35,8 +37,8 @@ MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/network src/opengl src/phonon \ src/qt3support src/script src/sql src/svg src/testlib \ - src/tools src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/tools src/xmlpatterns src/3rdparty/kdebase \ + src/3rdparty/kdelibs src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' diff --git a/devel/qt4-qdbusviewer/distinfo b/devel/qt4-qdbusviewer/distinfo index 1756af8b04d9..27b0949354e8 100644 --- a/devel/qt4-qdbusviewer/distinfo +++ b/devel/qt4-qdbusviewer/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile index d70d210872f3..aacd34bb7def 100644 --- a/devel/qt4-qt3support/Makefile +++ b/devel/qt4-qt3support/Makefile @@ -22,6 +22,7 @@ USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build corelib gui network sql xml QT_NONSTANDARD= yes QT_DIST= yes +MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/qt4 diff --git a/devel/qt4-qt3support/distinfo b/devel/qt4-qt3support/distinfo index 1756af8b04d9..27b0949354e8 100644 --- a/devel/qt4-qt3support/distinfo +++ b/devel/qt4-qt3support/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/qt4-qt3support/pkg-plist b/devel/qt4-qt3support/pkg-plist index 03571e2b578c..9aa5b8446ca2 100644 --- a/devel/qt4-qt3support/pkg-plist +++ b/devel/qt4-qt3support/pkg-plist @@ -405,9 +405,9 @@ lib/qt4/libQt3Support.la lib/qt4/libQt3Support.prl lib/qt4/libQt3Support.so lib/qt4/libQt3Support.so.4 -lib/qt4/libQt3Support.so.4.4 -lib/qt4/libQt3Support.so.4.4.3 -%%DEBUG%%lib/qt4/libQt3Support.so.4.4.3.debug +lib/qt4/libQt3Support.so.4.5 +lib/qt4/libQt3Support.so.4.5.2 +@comment %%DEBUG%%lib/qt4/libQt3Support.so.4.5.2.debug libdata/pkgconfig/Qt3Support.pc @dirrm include/qt4/Qt3Support @dirrmtry include/qt4/Qt diff --git a/devel/qt4-qtestlib/Makefile b/devel/qt4-qtestlib/Makefile index b7f834bfc854..62069134b386 100644 --- a/devel/qt4-qtestlib/Makefile +++ b/devel/qt4-qtestlib/Makefile @@ -22,6 +22,7 @@ USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build corelib QT_NONSTANDARD= yes QT_DIST= yes +MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/qt4 diff --git a/devel/qt4-qtestlib/distinfo b/devel/qt4-qtestlib/distinfo index 1756af8b04d9..27b0949354e8 100644 --- a/devel/qt4-qtestlib/distinfo +++ b/devel/qt4-qtestlib/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/qt4-qtestlib/pkg-plist b/devel/qt4-qtestlib/pkg-plist index 8ef2d46a6c74..e2ae50f136fe 100644 --- a/devel/qt4-qtestlib/pkg-plist +++ b/devel/qt4-qtestlib/pkg-plist @@ -11,6 +11,7 @@ include/qt4/Qt/qtestevent.h include/qt4/Qt/qtesteventloop.h include/qt4/Qt/qtestkeyboard.h include/qt4/Qt/qtestmouse.h +include/qt4/Qt/qbenchmark.h include/qt4/Qt/qtestspontaneevent.h include/qt4/Qt/qtestsystem.h include/qt4/QtTest/QEventSizeOfChecker @@ -28,6 +29,7 @@ include/qt4/QtTest/QTestKeyClicksEvent include/qt4/QtTest/QTestKeyEvent include/qt4/QtTest/QTestMouseEvent include/qt4/QtTest/QtTest +include/qt4/QtTest/qbenchmark.h include/qt4/QtTest/qsignalspy.h include/qt4/QtTest/qtest.h include/qt4/QtTest/qtest_global.h @@ -46,9 +48,9 @@ lib/qt4/libQtTest.la lib/qt4/libQtTest.prl lib/qt4/libQtTest.so lib/qt4/libQtTest.so.4 -lib/qt4/libQtTest.so.4.4 -lib/qt4/libQtTest.so.4.4.3 -%%DEBUG%%lib/qt4/libQtTest.so.4.4.3.debug +lib/qt4/libQtTest.so.4.5 +lib/qt4/libQtTest.so.4.5.2 +%%DEBUG%%lib/qt4/libQtTest.so.4.5.2.debug libdata/pkgconfig/QtTest.pc @dirrm include/qt4/QtTest @dirrmtry include/qt4/Qt diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile index c9af06021cdf..14f4a354dc05 100644 --- a/devel/qt4-qvfb/Makefile +++ b/devel/qt4-qvfb/Makefile @@ -8,7 +8,7 @@ PORTNAME= qvfb PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 +PORTREVISION=0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -23,6 +23,7 @@ QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib gui opengl QT_NONSTANDARD= yes QT_DIST= yes USE_XORG= xtst +MAKE_JOBS_SAVE= yes HAS_CONFIGURE= yes @@ -44,6 +45,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME} CONFIGURE_WRKSRC=${WRKSRC}/../../ +CONFIGURE_ARGS+= -I../../include/Qt -I../../include + pre-configure: ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${MKDIR} ${WRKSRC}/../../mkspecs diff --git a/devel/qt4-qvfb/distinfo b/devel/qt4-qvfb/distinfo index 1756af8b04d9..27b0949354e8 100644 --- a/devel/qt4-qvfb/distinfo +++ b/devel/qt4-qvfb/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/qt4-rcc/Makefile b/devel/qt4-rcc/Makefile index 3b503b92ea79..3978b22d547c 100644 --- a/devel/qt4-rcc/Makefile +++ b/devel/qt4-rcc/Makefile @@ -21,6 +21,7 @@ USE_QT_VER= 4 QT_COMPONENTS= qmake_build QT_NONSTANDARD= yes QT_DIST= yes +MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes @@ -49,4 +50,7 @@ pre-configure: ${MKDIR} ${WRKSRC}/../../../mkspecs ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../bin/qmake +do-build: + cd ${CONFIGURE_WRKSRC}/src/tools/bootstrap/ && make + .include <bsd.port.mk> diff --git a/devel/qt4-rcc/distinfo b/devel/qt4-rcc/distinfo index 1756af8b04d9..27b0949354e8 100644 --- a/devel/qt4-rcc/distinfo +++ b/devel/qt4-rcc/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/qt4-script/Makefile b/devel/qt4-script/Makefile index 831b9a7a2c0b..971f0c7096fb 100644 --- a/devel/qt4-script/Makefile +++ b/devel/qt4-script/Makefile @@ -22,6 +22,7 @@ USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build corelib QT_NONSTANDARD= yes QT_DIST= yes +MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/qt4 diff --git a/devel/qt4-script/distinfo b/devel/qt4-script/distinfo index 1756af8b04d9..27b0949354e8 100644 --- a/devel/qt4-script/distinfo +++ b/devel/qt4-script/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/qt4-script/pkg-plist b/devel/qt4-script/pkg-plist index 4f129d024ae8..d1fa8f361aae 100644 --- a/devel/qt4-script/pkg-plist +++ b/devel/qt4-script/pkg-plist @@ -21,6 +21,7 @@ include/qt4/QtScript/QScriptEngineAgent include/qt4/QtScript/QScriptExtensionInterface include/qt4/QtScript/QScriptExtensionPlugin include/qt4/QtScript/QScriptString +include/qt4/QtScript/QScriptSyntaxCheckResult include/qt4/QtScript/QScriptValue include/qt4/QtScript/QScriptValueIterator include/qt4/QtScript/QScriptValueList @@ -42,9 +43,9 @@ lib/qt4/libQtScript.la lib/qt4/libQtScript.prl lib/qt4/libQtScript.so lib/qt4/libQtScript.so.4 -lib/qt4/libQtScript.so.4.4 -lib/qt4/libQtScript.so.4.4.3 -%%DEBUG%%lib/qt4/libQtScript.so.4.4.3.debug +lib/qt4/libQtScript.so.4.5 +lib/qt4/libQtScript.so.4.5.2 +%%DEBUG%%lib/qt4/libQtScript.so.4.5.2.debug libdata/pkgconfig/QtScript.pc @dirrm include/qt4/QtScript @dirrmtry include/qt4/Qt diff --git a/devel/qt4-scripttools/Makefile b/devel/qt4-scripttools/Makefile new file mode 100644 index 000000000000..19d2bf4fdd2a --- /dev/null +++ b/devel/qt4-scripttools/Makefile @@ -0,0 +1,61 @@ +# New ports collection makefile for: qt4-scripttools +# Date created: 2009-04-28 +# Whom: Max Brazhnikov <makc@freebsd.org> +# +# $FreeBSD$ +# + +PORTNAME= scripttools +PORTVERSION= ${QT4_VERSION} +PORTREVISION=0 +CATEGORIES?= devel +MASTER_SITES= ${MASTER_SITE_QT} +PKGNAMEPREFIX= qt4- +DISTNAME= qt-x11-opensource-src-${PORTVERSION} +DIST_SUBDIR= KDE + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt script + +USE_QT_VER= 4 +QT_COMPONENTS= qmake_build moc_build rcc_build gui script +QT_NONSTANDARD= yes +QT_DIST= yes +MAKE_JOBS_SAFE= yes + +HAS_CONFIGURE= yes +USE_LDCONFIG= ${PREFIX}/lib/qt4 + +ALL_TARGET= first +CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH +MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ + PATH=${WRKSRC}/bin:$$PATH + +DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ + src/dbus src/network src/opengl src/phonon \ + src/qt3support src/sql src/svg src/testlib \ + src/tools src/xml src/xmlpatterns src/3rdparty/clucene \ + src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit +EXTRACT_AFTER_ARGS= | ${TAR} -xf - +.for dne in ${DO_NOT_EXTRACT} +EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' +.endfor + +BUILD_WRKSRC=${WRKSRC}/src/${PORTNAME} +INSTALL_WRKSRC=${BUILD_WRKSRC} + +pre-configure: + ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${WRKSRC} + ${MKDIR} ${WRKSRC}/mkspecs + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake + ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc + ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc + +post-configure: + ${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ + -e 's|.*$$(QMAKE).*||g' ${BUILD_WRKSRC}/Makefile + ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ + -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ + ${WRKSRC}/lib/pkgconfig/QtScriptTools.pc + +.include <bsd.port.mk> diff --git a/devel/qt4-scripttools/distinfo b/devel/qt4-scripttools/distinfo new file mode 100644 index 000000000000..27b0949354e8 --- /dev/null +++ b/devel/qt4-scripttools/distinfo @@ -0,0 +1,3 @@ +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/qt4-scripttools/pkg-descr b/devel/qt4-scripttools/pkg-descr new file mode 100644 index 000000000000..efc79b9aaf24 --- /dev/null +++ b/devel/qt4-scripttools/pkg-descr @@ -0,0 +1,12 @@ +Qt is a C++ toolkit for application development. It lets application +developers target all major operating systems with a single application +source code. + +Qt provides a platform-independent API to all central platform functionality: +GUI, database access, networking, file handling, etc. The Qt library +encapsulates the different APIs of different operating systems, providing +the application programmer with a single, common API for all operating systems. +The native C APIs are encapsulated in a set of well-designed, fully +object-oriented C++ classes. + +WWW: http://www.trolltech.com/products/qt/index.html diff --git a/devel/qt4-scripttools/pkg-plist b/devel/qt4-scripttools/pkg-plist new file mode 100644 index 000000000000..f1516693d4d5 --- /dev/null +++ b/devel/qt4-scripttools/pkg-plist @@ -0,0 +1,14 @@ +include/qt4/Qt/QtScriptTools +include/qt4/Qt/qscriptenginedebugger.h +include/qt4/QtScriptTools/QScriptEngineDebugger +include/qt4/QtScriptTools/QtScriptTools +include/qt4/QtScriptTools/qscriptenginedebugger.h +lib/qt4/libQtScriptTools.la +lib/qt4/libQtScriptTools.prl +lib/qt4/libQtScriptTools.so +lib/qt4/libQtScriptTools.so.4 +lib/qt4/libQtScriptTools.so.4.5 +lib/qt4/libQtScriptTools.so.4.5.2 +%%DEBUG%%lib/qt4/libQtScriptTools.so.4.5.2.debug +libdata/pkgconfig/QtScriptTools.pc +@dirrm include/qt4/QtScriptTools diff --git a/devel/qt4-uic/Makefile b/devel/qt4-uic/Makefile index daeb1448cdcd..f806fc6c344c 100644 --- a/devel/qt4-uic/Makefile +++ b/devel/qt4-uic/Makefile @@ -22,6 +22,7 @@ USE_QT_VER= 4 QT_COMPONENTS= qmake_build QT_NONSTANDARD= yes QT_DIST= yes +MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes @@ -51,4 +52,7 @@ pre-configure: ${MKDIR} ${WRKSRC}/../../../mkspecs ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../bin/qmake +do-build: + cd ${CONFIGURE_WRKSRC}/src/tools/bootstrap/ && make + .include <bsd.port.mk> diff --git a/devel/qt4-uic/distinfo b/devel/qt4-uic/distinfo index 1756af8b04d9..27b0949354e8 100644 --- a/devel/qt4-uic/distinfo +++ b/devel/qt4-uic/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile index 2677b6dcf74b..c6e14de4be4f 100644 --- a/devel/qt4-uic3/Makefile +++ b/devel/qt4-uic3/Makefile @@ -22,6 +22,7 @@ USE_QT_VER= 4 QT_COMPONENTS= qmake_build qt3support corelib gui network sql xml QT_NONSTANDARD= yes QT_DIST= yes +MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes diff --git a/devel/qt4-uic3/distinfo b/devel/qt4-uic3/distinfo index 1756af8b04d9..27b0949354e8 100644 --- a/devel/qt4-uic3/distinfo +++ b/devel/qt4-uic3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/devel/qt4/Makefile b/devel/qt4/Makefile index 10c777ccc03c..5e3d576f22b3 100644 --- a/devel/qt4/Makefile +++ b/devel/qt4/Makefile @@ -7,7 +7,7 @@ PORTNAME= qt4 PORTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION=0 CATEGORIES= devel MASTER_SITES= # empty DISTFILES= # none @@ -26,8 +26,8 @@ USE_QT_VER= 4 QT_COMPONENTS= accessible assistant assistant-adp assistantclient \ clucene corelib dbus designer doc help gui iconengines \ imageformats inputmethods network opengl qdbusviewer \ - qt3support qtestlib qvfb script sql svg webkit xml \ - xmlpatterns xmlpatterns-tool + qt3support qtestlib qvfb script scripttools sql svg webkit \ + xml xmlpatterns xmlpatterns-tool NO_BUILD= yes diff --git a/devel/qt4/files/Makefile.options b/devel/qt4/files/Makefile.options new file mode 100644 index 000000000000..732d16072bba --- /dev/null +++ b/devel/qt4/files/Makefile.options @@ -0,0 +1,15 @@ +#qt4-corelib and qt4-gui must recompiled both when changing options +QT4_OPTIONS_ALL=CUPS QGTKSTYLE NAS +QT4_OPTIONS?= +.if defined(PACKAGE_BUILDING) +QT4_OPTIONS+= CUPS +.endif + +.for opt in ${QT4_OPTIONS_ALL} +${opt}_REPLACE=\# +QT4_OPTIONS_REPLACE+= s,%%${opt}%%,${${opt}_REPLACE},g; +.endfor + +.for opt in ${QT4_OPTIONS} +${opt}_REPLACE= +.endfor diff --git a/devel/qt4/files/configure b/devel/qt4/files/configure index 8fc340ed7963..71197f82cac3 100644 --- a/devel/qt4/files/configure +++ b/devel/qt4/files/configure @@ -2,8 +2,8 @@ # # Configures to build the Qt library # -# Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -# Contact: Qt Software Information (qt-info@nokia.com) +# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +# Contact: Nokia Corporation (qt-info@nokia.com) # # This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE # WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. @@ -108,7 +108,7 @@ PLATFORM_X11=no PLATFORM_MAC=no PLATFORM_QWS=no -if [ -f "$relpath"/src/gui/kernel/qapplication_mac.cpp ] && [ -d /System/Library/Frameworks/Carbon.framework ]; then +if [ -f "$relpath"/src/gui/kernel/qapplication_mac.mm ] && [ -d /System/Library/Frameworks/Carbon.framework ]; then # Qt/Mac # ~ the Carbon SDK exists # ~ src/gui/base/qapplication_mac.cpp is present @@ -119,7 +119,13 @@ elif [ -f "$relpath"/src/gui/kernel/qapplication_qws.cpp ]; then # ~ src/gui/base/qapplication_qws.cpp is present # ~ this is the free or commercial edition # ~ this is the internal edition and Qt Embedded is explicitly enabled - PLATFORM_QWS=maybe + if [ -f "$relpath"/src/gui/kernel/qapplication_mac.mm ]; then + # This is a depot build, or an all-platforms package + PLATFORM_QWS=maybe + else + # This must be the embedded package, since the Qt/Mac source files are not present + PLATFORM_QWS=yes + fi fi #----------------------------------------------------------------------------- @@ -130,7 +136,7 @@ QT_MAJOR_VERSION= QT_MINOR_VERSION=0 QT_PATCH_VERSION=0 if [ -n "$QT_VERSION" ]; then - QT_VERSION=`echo $QT_VERSION | sed 's,^# *define *QT_VERSION_STR "*\([^ ]*\)"$,\1,'` + QT_VERSION=`echo $QT_VERSION | sed 's,^# *define *QT_VERSION_STR *"*\([^ ]*\)"$,\1,'` MAJOR=`echo $QT_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\1,'` if [ -n "$MAJOR" ]; then MINOR=`echo $QT_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\2,'` @@ -156,35 +162,144 @@ fi #------------------------------------------------------------------------------- # check the license #------------------------------------------------------------------------------- +COMMERCIAL_USER=no +CFG_DEV=no +CFG_NOKIA=no +CFG_EMBEDDED=no +EditionString=Commercial -if [ -f "$relpath"/LICENSE.Qtopia ]; then - # Qtopia Edition - [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes - Licensee="Qtopia" - Edition="Qtopia" - QT_EDITION="QT_EDITION_DESKTOP" -elif [ -f "$relpath"/LICENSE.GPL2 -o -f "$relpath"/LICENSE.GPL3 ]; then - # Open Source edition - may only be used under the terms of the GPL. - [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes - [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes - Licensee="Open Source" - Edition="OpenSource" - EditionString="Open Source" +earlyArgParse() +{ + # parse the arguments, setting things to "yes" or "no" + while [ "$#" -gt 0 ]; do + CURRENT_OPT="$1" + UNKNOWN_ARG=no + case "$1" in + #Autoconf style options + --enable-*) + VAR=`echo $1 | sed "s,^--enable-\(.*\),\1,"` + VAL=yes + ;; + --disable-*) + VAR=`echo $1 | sed "s,^--disable-\(.*\),\1,"` + VAL=no + ;; + --*=*) + VAR=`echo $1 | sed "s,^--\(.*\)=.*,\1,"` + VAL=`echo $1 | sed "s,^--.*=\(.*\),\1,"` + ;; + --no-*) + VAR=`echo $1 | sed "s,^--no-\(.*\),\1,"` + VAL=no + ;; + -embedded) + VAR=embedded + # this option may or may not be followed by an argument + if [ -z "$2" ] || echo "$2" | grep '^-' >/dev/null 2>&1; then + VAL=auto + else + shift; + VAL=$1 + fi + ;; + -h|help|--help|-help) + if [ "$VAL" = "yes" ]; then + OPT_HELP="$VAL" + COMMERCIAL_USER="no" #doesn't matter we will display the help + else + UNKNOWN_OPT=yes + COMMERCIAL_USER="no" #doesn't matter we will display the help + fi + ;; + --*) + VAR=`echo $1 | sed "s,^--\(.*\),\1,"` + VAL=yes + ;; + -*) + VAR=`echo $1 | sed "s,^-\(.*\),\1,"` + VAL="unknown" + ;; + *) + UNKNOWN_ARG=yes + ;; + esac + if [ "$UNKNOWN_ARG" = "yes" ]; then + shift + continue + fi + shift + + UNKNOWN_OPT=no + case "$VAR" in + embedded) + CFG_EMBEDDED="$VAL" + if [ "$PLATFORM_QWS" != "no" ]; then + if [ "$PLATFORM_QWS" = "maybe" ]; then + PLATFORM_X11=no + PLATFORM_MAC=no + PLATFORM_QWS=yes + fi + else + echo "No license exists to enable Qt for Embedded Linux. Disabling." + CFG_EMBEDDED=no + fi + ;; + developer-build) + CFG_DEV="yes" + ;; + nokia-developer) + CFG_DEV="yes" + CFG_NOKIA="yes" + COMMERCIAL_USER="no" + ;; + commercial) + COMMERCIAL_USER="yes" + ;; + opensource) + COMMERCIAL_USER="no" + ;; + *) + UNKNOWN_OPT=yes + ;; + esac + done +} + +earlyArgParse "$@" + +if [ "$COMMERCIAL_USER" = "ask" ]; then + while true; do + echo "Which edition of Qt do you want to use ?" + echo + echo "Type 'c' if you want to use the Commercial Edition." + echo "Type 'o' if you want to use the Open Source Edition." + echo + read commercial + echo + if [ "$commercial" = "c" ]; then + COMMERCIAL_USER="yes" + break + elif [ "$commercial" = "o" ]; then + COMMERCIAL_USER="no" + break + fi + done +fi + +if [ "$CFG_NOKIA" = "yes" ]; then + Licensee="Nokia" + Edition="NokiaInternalBuild" + EditionString="Nokia Internal Build" QT_EDITION="QT_EDITION_OPENSOURCE" -elif [ -f "$relpath"/.LICENSE ]; then - # Generic, non final license [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes - [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes - Edition=`sed 's/ LICENSE AGREEMENT//;q' .LICENSE` - Licensee="$Edition" - QT_EDITION="QT_EDITION_DESKTOP" -elif [ -f "$relpath"/LICENSE.TROLL ]; then - # internal Trolltech edition +elif [ -f "$relpath"/LICENSE.PREVIEW.COMMERCIAL ] && [ $COMMERCIAL_USER = "yes" ]; then + # Commercial preview release [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes - Licensee="Trolltech" - Edition="Trolltech" + Licensee="Preview" + Edition="Preview" QT_EDITION="QT_EDITION_DESKTOP" -else + LicenseType="Technology Preview" +elif [ $COMMERCIAL_USER = "yes" ]; then # one of commercial editions [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes @@ -196,7 +311,7 @@ else echo echo "You are using an old license file." echo - echo "Please install the license file supplied by Trolltech," + echo "Please install the license file supplied by Nokia," echo "or install the Qt Open Source Edition if you intend to" echo "develop free software." exit 1 @@ -331,6 +446,31 @@ else ;; esac fi + + if test -r "$relpath/.LICENSE"; then + # Generic, non-final license + LICENSE_EXTENSION="" + line=`sed 'y/a-z/A-Z/;q' "$relpath"/.LICENSE` + case "$line" in + *BETA*) + Edition=Beta + ;; + *TECHNOLOGY?PREVIEW*) + Edition=Preview + ;; + *EVALUATION*) + Edition=Evaluation + ;; + *) + echo >&2 "Invalid license files; cannot continue" + exit 1 + ;; + esac + Licensee="$Edition" + EditionString="$Edition" + QT_EDITION="QT_EDITION_DESKTOP" + fi + case "$LicenseFeatureCode" in G|L) # US @@ -360,27 +500,8 @@ else exit 1 ;; esac - case "$LicenseFeatureCode" in - G|2) - # delete qtusagereporter for non-metered licenses - rm -f "$relpath/bin/qtusagereporter" - ;; - L|5) - # copy qtusagereporter for metered licenses - if [ '!' -f "$outpath/bin/qtusagereporter" ]; then - mkdir -p "$outpath/bin" - cp -f "$relpath/bin/qtusagereporter" "$outpath/bin/qtusagereporter" - fi - QT_CONFIG="$QT_CONFIG qtusagereporter" - ;; - *) - echo - echo "Invalid license key. Please check the license key." - exit 1 - ;; - esac if [ '!' -f "$outpath/LICENSE" ]; then - echo "The LICENSE, LICENSE.GPL2, or LICENSE.GPL3 file shipped with" + echo "The LICENSE, LICENSE.GPL3 LICENSE.LGPL file shipped with" echo "this software has disappeared." echo echo "Sorry, you are not licensed to use this software." @@ -388,30 +509,29 @@ else echo exit 1 fi +elif [ $COMMERCIAL_USER = "no" ]; then + # Open Source edition - may only be used under the terms of the GPL or LGPL. + [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes + Licensee="Open Source" + Edition="OpenSource" + EditionString="Open Source" + QT_EDITION="QT_EDITION_OPENSOURCE" fi -if [ "$PLATFORM_QWS" = "yes" ]; then - Platform="Qt for Embedded Linux" -elif [ "$PLATFORM_MAC" = "yes" ]; then - Platform="Qt/Mac" -else - PLATFORM_X11=yes - Platform="Qt/X11" -fi - -echo -echo "This is the $Platform ${EditionString-$Edition} Edition." -echo - #------------------------------------------------------------------------------- # initalize variables #------------------------------------------------------------------------------- SYSTEM_VARIABLES="CC CXX CFLAGS CXXFLAGS LDFLAGS" for varname in $SYSTEM_VARIABLES; do + qmakevarname="${varname}" + # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS + if [ "${varname}" = "LDFLAGS" ]; then + qmakevarname="LFLAGS" + fi cmd=`echo \ 'if [ -n "\$'${varname}'" ]; then - QMakeVar set QMAKE_'${varname}' "\$'${varname}'" + QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" fi'` eval "$cmd" done @@ -426,7 +546,7 @@ QMakeVar add gfx-drivers "linuxfb" QMakeVar add kbd-drivers "tty" QMakeVar add mouse-drivers "pc linuxtp" -if [ "$Edition" = "Trolltech" ]; then +if [ "$CFG_DEV" = "yes" ]; then QMakeVar add kbd-drivers "um" fi @@ -440,10 +560,10 @@ MIN_DBUS_1_VERSION=0.62 CFG_CONFIGURE_EXIT_ON_ERROR=yes CFG_PROFILE=no CFG_EXCEPTIONS=unspecified +CFG_SCRIPTTOOLS=auto # (yes|no|auto) CFG_XMLPATTERNS=auto # (yes|no|auto) CFG_INCREMENTAL=auto CFG_QCONFIG=full -CFG_EMBEDDED=no CFG_DEBUG=auto CFG_MYSQL_CONFIG= CFG_DEBUG_RELEASE=no @@ -464,8 +584,9 @@ CFG_LIBJPEG=auto CFG_MNG=auto CFG_LIBMNG=auto CFG_XCURSOR=runtime -CFG_XRANDR=auto +CFG_XRANDR=runtime CFG_XRENDER=auto +CFG_MITSHM=auto CFG_OPENGL=auto CFG_SSE=auto CFG_FONTCONFIG=auto @@ -480,7 +601,6 @@ CFG_PHONON=auto CFG_PHONON_BACKEND=yes CFG_SVG=yes CFG_WEBKIT=auto # (yes|no|auto) -CFG_ASSISTANT_WEBKIT=no CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen" CFG_GFX_ON="linuxfb multiscreen" @@ -492,11 +612,6 @@ CFG_KBD_ON="tty" #default, see QMakeVar above CFG_MOUSE_AVAILABLE="pc bus linuxtp yopy vr41xx tslib qvfb" CFG_MOUSE_ON="pc linuxtp" #default, see QMakeVar above -if [ "$Edition" = "Trolltech" ]; then - CFG_KBD_AVAILABLE="${CFG_KBD_AVAILABLE} um" - CFG_KBD_ON="${CFG_KBD_ON} um" -fi - CFG_ARCH= CFG_HOST_ARCH= CFG_KBD_PLUGIN_AVAILABLE= @@ -511,7 +626,7 @@ CFG_DECORATION_AVAILABLE="styled windows default" CFG_DECORATION_ON="${CFG_DECORATION_AVAILABLE}" # all on by default CFG_DECORATION_PLUGIN_AVAILABLE= CFG_DECORATION_PLUGIN= -CFG_TABLET=auto +CFG_XINPUT=runtime CFG_XKB=auto CFG_NIS=auto CFG_CUPS=auto @@ -519,8 +634,10 @@ CFG_ICONV=auto CFG_DBUS=auto CFG_GLIB=auto CFG_GSTREAMER=auto +CFG_QGTKSTYLE=auto CFG_LARGEFILE=auto CFG_OPENSSL=auto +CFG_PTMALLOC=no CFG_STL=auto CFG_PRECOMPILE=auto CFG_SEPARATE_DEBUG_INFO=auto @@ -551,7 +668,12 @@ CFG_INOTIFY=auto CFG_RPATH=yes CFG_FRAMEWORK=auto CFG_MAC_ARCHS= -CFG_MAC_DWARF2=no +MAC_ARCHS_COMMANDLINE= +CFG_MAC_DWARF2=auto +CFG_MAC_XARCH=auto +CFG_MAC_CARBON=yes +CFG_MAC_COCOA=auto +COMMANDLINE_MAC_COCOA=no CFG_SXE=no CFG_PREFIX_INSTALL=yes CFG_SDK= @@ -570,6 +692,7 @@ OPT_FAST=auto OPT_VERBOSE=no OPT_HELP= CFG_SILENT=no +CFG_GRAPHICS_SYSTEM=default # initalize variables used for installation QT_INSTALL_PREFIX= @@ -708,13 +831,10 @@ while [ "$#" -gt 0 ]; do VAL=no ;; #Qt style yes options - -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-tablet|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-opengl|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-xmlpatterns|-phonon|-phonon-backend|-svg|-webkit|-assistant-webkit) + -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xinput|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-svg|-webkit|-scripttools|-rpath|-force-pkg-config) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` VAL=yes ;; - -force-pkg-config) - QT_FORCE_PKGCONFIG=yes - ;; #Qt style options that pass an argument -qconfig) if [ "$PLATFORM_QWS" = "yes" ]; then @@ -756,6 +876,16 @@ while [ "$#" -gt 0 ]; do VAL=$1 fi ;; + -opengl) + VAR=opengl + # this option may or may not be followed by an argument + if [ -z "$2" ] || echo "$2" | grep '^-' >/dev/null 2>&1; then + VAL=yes + else + shift; + VAL=$1 + fi + ;; -hostprefix) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` # this option may or may not be followed by an argument @@ -779,6 +909,11 @@ while [ "$#" -gt 0 ]; do shift VAL="$1" ;; + -graphicssystem) + VAR="graphicssystem" + shift + VAL=$1 + ;; -qtlibinfix) VAR="qtlibinfix" shift @@ -890,6 +1025,9 @@ while [ "$#" -gt 0 ]; do hostprefix) QT_HOST_PREFIX="$VAL" ;; + force-pkg-config) + QT_FORCE_PKGCONFIG=yes + ;; docdir) QT_INSTALL_DOCS="$VAL" ;; @@ -984,12 +1122,32 @@ while [ "$#" -gt 0 ]; do CFG_QWS_DEPTHS="$VAL" ;; opengl) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + if [ "$VAL" = "auto" ] || [ "$VAL" = "desktop" ] || + [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || + [ "$VAL" = "es1cl" ] || [ "$VAL" = "es1" ] || [ "$VAL" = "es2" ]; then CFG_OPENGL="$VAL" else UNKNOWN_OPT=yes fi ;; + graphicssystem) + if [ "$PLATFORM_QWS" = "yes" ]; then + echo "Error: Graphics System plugins are not supported on QWS." + echo " On QWS, the graphics system API is part of the QScreen plugin architecture " + echo " rather than existing as a separate plugin." + echo "" + UNKNOWN_OPT=yes + else + if [ "$VAL" = "opengl" ]; then + CFG_GRAPHICS_SYSTEM="opengl" + elif [ "$VAL" = "raster" ]; then + CFG_GRAPHICS_SYSTEM="raster" + else + UNKNOWN_OPT=yes + fi + fi + ;; + qvfb) # left for commandline compatibility, not documented if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then if [ "$VAL" = "yes" ]; then @@ -1052,6 +1210,14 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + cocoa) + if [ "$PLATFORM_MAC" = "yes" ] && [ "$VAL" = "yes" ]; then + CFG_MAC_COCOA="$VAL" + COMMANDLINE_MAC_COCOA="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; framework) if [ "$PLATFORM_MAC" = "yes" ]; then CFG_FRAMEWORK="$VAL" @@ -1176,6 +1342,9 @@ while [ "$#" -gt 0 ]; do debug) CFG_DEBUG="$VAL" ;; + developer-build|commercial|opensource|nokia-developer) + # These switches have been dealt with already + ;; static) if [ "$VAL" = "yes" ]; then CFG_SHARED=no @@ -1250,9 +1419,9 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; - tablet) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_TABLET="$VAL" + xinput) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then + CFG_XINPUT="$VAL" else UNKNOWN_OPT=yes fi @@ -1402,7 +1571,7 @@ while [ "$#" -gt 0 ]; do fi ;; xrandr) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then CFG_XRANDR="$VAL" else UNKNOWN_OPT=yes @@ -1415,6 +1584,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + mitshm) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_MITSHM="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; fontconfig) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_FONTCONFIG="$VAL" @@ -1457,6 +1633,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + gtkstyle) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_QGTKSTYLE="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; qdbus|dbus) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "linked" ]; then CFG_DBUS="$VAL" @@ -1501,6 +1684,14 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + ptmalloc) + if [ "$VAL" = "yes" ]; then + CFG_PTMALLOC="yes" + else + UNKNOWN_OPT=yes + fi + ;; + xmlpatterns) if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then CFG_XMLPATTERNS="yes" @@ -1512,6 +1703,17 @@ while [ "$#" -gt 0 ]; do fi fi ;; + scripttools) + if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then + CFG_SCRIPTTOOLS="yes" + else + if [ "$VAL" = "no" ]; then + CFG_SCRIPTTOOLS="no" + else + UNKNOWN_OPT=yes + fi + fi + ;; svg) if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then CFG_SVG="yes" @@ -1534,17 +1736,6 @@ while [ "$#" -gt 0 ]; do fi fi ;; - assistant-webkit) - if [ "$VAL" = "yes" ]; then - CFG_ASSISTANT_WEBKIT="yes" - else - if [ "$VAL" = "no" ]; then - CFG_ASSISTANT_WEBKIT="no" - else - UNKNOWN_OPT=yes - fi - fi - ;; confirm-license) if [ "$VAL" = "yes" ]; then OPT_CONFIRM_LICENSE="$VAL" @@ -1757,11 +1948,23 @@ if [ "$CFG_QCONFIG" != "full" ] && [ "$CFG_QT3SUPPORT" = "yes" ]; then CFG_QT3SUPPORT="no" fi -if [ "$CFG_ASSISTANT_WEBKIT" = "yes" ] && [ "$CFG_WEBKIT" = "no" ]; then - echo "Warning: WebKit cannot be used in Qt Assistant, since the Qt WebKit module" - echo "won't be built with the current configuration." - CFG_ASSISTANT_WEBKIT="no" -fi +# update QT_CONFIG to show our current predefined configuration +case "$CFG_QCONFIG" in +minimal|small|medium|large|full) + # these are a sequence of increasing functionality + for c in minimal small medium large full; do + QT_CONFIG="$QT_CONFIG $c-config" + [ "$CFG_QCONFIG" = $c ] && break + done + ;; +*) + # not known to be sufficient for anything + if [ '!' -f "$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h" ]; then + echo >&2 "Error: configuration file not found:" + echo >&2 " $relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h" + OPT_HELP=yes + fi +esac #------------------------------------------------------------------------------- # build tree initialization @@ -1772,7 +1975,7 @@ unixtests="$relpath/config.tests/unix" mactests="$relpath/config.tests/mac" WHICH="$unixtests/which.test" -PKG_CONFIG=`$WHICH pkg-config 2>/dev/null` +PERL=`$WHICH perl 2>/dev/null` # find out which awk we want to use, prefer gawk, then nawk, then regular awk AWK= @@ -1819,7 +2022,7 @@ if [ "$CFG_DEBUG" = "auto" ]; then if [ "$PLATFORM_MAC" = "yes" ]; then CFG_DEBUG_RELEASE=yes CFG_DEBUG=yes - elif [ "$Edition" = "Trolltech" ]; then + elif [ "$CFG_DEV" = "yes" ]; then CFG_DEBUG_RELEASE=no CFG_DEBUG=yes else @@ -1839,6 +2042,14 @@ fi # symlink or copy part of the sources if [ "$OPT_SHADOW" = "yes" ]; then echo "Preparing build tree..." + + if [ -z "$PERL" ]; then + echo + echo "You need perl in your PATH to make a shadow build." + echo "Cannot proceed." + exit 1 + fi + [ -d "$outpath/bin" ] || mkdir -p "$outpath/bin" # symlink the qmake directory @@ -1866,12 +2077,11 @@ if [ "$OPT_SHADOW" = "yes" ]; then # make a syncqt script that can be used in the shadow rm -f "$outpath/bin/syncqt" - if [ -x "/usr/bin/perl" ] && [ -x "$relpath/bin/syncqt" ]; then + if [ -x "$relpath/bin/syncqt" ]; then mkdir -p "$outpath/bin" echo "#!/bin/sh" >"$outpath/bin/syncqt" echo "QTDIR=\"$relpath\"; export QTDIR" >>"$outpath/bin/syncqt" - [ "$Edition" = "Trolltech" ] && echo "perl \"$relpath/bin/syncqt\" -outdir \"$relpath\" \$*" >>"$outpath/bin/syncqt" - echo "perl \"$relpath/bin/syncqt\" -outdir \"$outpath\"" >>"$outpath/bin/syncqt" + echo "perl \"$relpath/bin/syncqt\" -outdir \"$outpath\" $*" >>"$outpath/bin/syncqt" chmod 755 "$outpath/bin/syncqt" fi @@ -1886,7 +2096,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then fi # symlink files from src/gui/embedded neccessary to build qvfb -if [ "$Edition" = "Trolltech" -o "$Edition" = "Qtopia" ]; then +if [ "$CFG_DEV" = "yes" ]; then for f in qvfbhdr.h qlock_p.h qlock.cpp qwssignalhandler_p.h qwssignalhandler.cpp; do dest="${relpath}/tools/qvfb/${f}" rm -f "$dest" @@ -1898,12 +2108,12 @@ fi if [ "$PLATFORM_QWS" = "yes" ] && [ ! -e "${outpath}/lib/fonts" ]; then if [ "$PLATFORM" = "$XPLATFORM" ]; then mkdir -p "${outpath}/lib" - ln -s "${relpath}/dist/embedded-linux/lib/fonts" "${outpath}/lib/fonts" + ln -s "${relpath}/lib/fonts" "${outpath}/lib/fonts" fi fi if [ "$OPT_FAST" = "auto" ]; then - if [ '!' -z "$AWK" ] && [ "$Edition" = "Trolltech" ]; then + if [ '!' -z "$AWK" ] && [ "$CFG_DEV" = "yes" ]; then OPT_FAST=yes else OPT_FAST=no @@ -1965,6 +2175,9 @@ if [ "$CFG_EMBEDDED" != "no" ]; then *86_64) PLATFORM=qws/linux-x86_64-g++ ;; + *ppc) + PLATFORM=qws/linux-ppc-g++ + ;; *) PLATFORM=qws/linux-generic-g++ ;; @@ -1982,6 +2195,9 @@ if [ "$CFG_EMBEDDED" != "no" ]; then *86_64) CFG_EMBEDDED=x86_64 ;; + *ppc) + CFG_EMBEDDED=ppc + ;; *) CFG_EMBEDDED=generic ;; @@ -2086,7 +2302,7 @@ if [ -z "$PLATFORM" ]; then ;; Linux:*) case "$UNAME_MACHINE" in - x86_64|s390x) + x86_64|s390x|ppc64) PLATFORM=linux-g++-64 ;; *) @@ -2391,6 +2607,15 @@ if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then ipaq|sharp) CFG_ARCH=arm ;; + dm7000) + CFG_ARCH=powerpc + ;; + dm800) + CFG_ARCH=mips + ;; + sh4al) + CFG_ARCH=sh4a + ;; *) CFG_ARCH="$CFG_EMBEDDED" ;; @@ -2433,9 +2658,17 @@ fi # tests that don't need qmake (must be run before displaying help) #------------------------------------------------------------------------------- +if [ -z "$PKG_CONFIG" ]; then + # See if PKG_CONFIG is set in the mkspec: + PKG_CONFIG=`getQMakeConf "$XQMAKESPEC" | sed -n -e 's%PKG_CONFIG[^_].*=%%p' | tr '\n' ' '` +fi +if [ -z "$PKG_CONFIG" ]; then + PKG_CONFIG=`$WHICH pkg-config 2>/dev/null` +fi + # Work out if we can use pkg-config if [ "$QT_CROSS_COMPILE" = "yes" ]; then - if [ -n "$QT_FORCE_PKGCONFIG" ]; then + if [ "$QT_FORCE_PKGCONFIG" = "yes" ]; then echo >&2 "" echo >&2 "You have asked to use pkg-config and are cross-compiling." echo >&2 "Please make sure you have a correctly set-up pkg-config" @@ -2447,12 +2680,12 @@ if [ "$QT_CROSS_COMPILE" = "yes" ]; then echo >&2 "the host compiler's .pc files will be used. This is probably" echo >&2 "not what you want." echo >&2 "" - elif [ -z "$PKG_CONFIG_SYSROOT" ]; then + elif [ -z "$PKG_CONFIG_SYSROOT" ] && [ -z "$PKG_CONFIG_SYSROOT_DIR" ]; then echo >&2 "" - echo >&2 "Warning: PKG_CONFIG_SYSROOT has not been set. This means" - echo >&2 "your toolchain's .pc files must contain the paths to the" - echo >&2 "toolchain's libraries & headers. If configure tests are" - echo >&2 "failing, please check these files." + echo >&2 "Warning: PKG_CONFIG_SYSROOT/PKG_CONFIG_SYSROOT_DIR has not" + echo >&2 "been set. This means your toolchain's .pc files must contain" + echo >&2 "the paths to the toolchain's libraries & headers. If configure" + echo >&2 "tests are failing, please check these files." echo >&2 "" fi else @@ -2460,6 +2693,31 @@ if [ "$QT_CROSS_COMPILE" = "yes" ]; then fi fi +# process CFG_MAC_ARCHS +if [ "$PLATFORM_MAC" = "yes" ]; then +# check -arch arguments for validity. + ALLOWED="x86 ppc x86_64 ppc64 i386" + # Save the list so we can re-write it using only valid values + CFG_MAC_ARCHS_IN="$CFG_MAC_ARCHS" + CFG_MAC_ARCHS= + for i in $CFG_MAC_ARCHS_IN + do + if echo "$ALLOWED" | grep -w -v "$i" > /dev/null 2>&1; then + echo "Unknown architecture: \"$i\". Supported architectures: x86[i386] ppc x86_64 ppc64"; + exit 2; + fi + if [ "$i" = "i386" -o "$i" = "x86" ]; then + # These are synonymous values + # CFG_MAC_ARCHS requires x86 while GCC requires i386 + CFG_MAC_ARCHS="$CFG_MAC_ARCHS x86" + MAC_ARCHS_COMMANDLINE="$MAC_ARCHS_COMMANDLINE -arch i386" + else + CFG_MAC_ARCHS="$CFG_MAC_ARCHS $i" + MAC_ARCHS_COMMANDLINE="$MAC_ARCHS_COMMANDLINE -arch $i" + fi + done +fi + # find the default framework value if [ "$PLATFORM_MAC" = "yes" ] && [ "$PLATFORM" != "macx-xlc" ]; then if [ "$CFG_FRAMEWORK" = "auto" ]; then @@ -2495,14 +2753,23 @@ elif [ "$CFG_PRECOMPILE" = "yes" ] && [ `echo "$CFG_MAC_ARCHS" | wc -w` -gt 1 ]; fi #auto-detect DWARF2 on the mac -if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" != "no" ]; then - if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then +if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" == "auto" ]; then + if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then CFG_MAC_DWARF2=no else CFG_MAC_DWARF2=yes fi fi +# auto-detect support for -Xarch on the mac +if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" == "auto" ]; then + if "$mactests/xarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then + CFG_MAC_XARCH=no + else + CFG_MAC_XARCH=yes + fi +fi + # don't autodetect support for separate debug info on objcopy when # cross-compiling as lots of toolchains seems to have problems with this if [ "$QT_CROSS_COMPILE" = "yes" ] && [ "$CFG_SEPARATE_DEBUG_INFO" = "auto" ]; then @@ -2554,10 +2821,15 @@ if [ "$CFG_USE_GNUMAKE" = "auto" ] && "$MAKE" -v | grep "GNU Make" >/dev/null 2> CFG_USE_GNUMAKE=yes fi +# If -opengl wasn't specified, don't try to auto-detect +if [ "$PLATFORM_QWS" = "yes" ] && [ "$CFG_OPENGL" = "auto" ]; then + CFG_OPENGL=no +fi + # mac if [ "$PLATFORM_MAC" = "yes" ]; then - if [ "$CFG_OPENGL" = "auto" ]; then - CFG_OPENGL=yes + if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then + CFG_OPENGL=desktop fi fi @@ -2577,15 +2849,6 @@ fi # x11 tests are done after qmake is built -# embedded -if [ "$PLATFORM_QWS" = "yes" ]; then - - # No OpenGL by default for Qt Embedded - if [ "$CFG_OPENGL" = "auto" ]; then - CFG_OPENGL=no - fi - -fi # QWS #setup the build parts if [ -z "$CFG_BUILD_PARTS" ]; then @@ -2612,7 +2875,7 @@ fi #prefix if [ -z "$QT_INSTALL_PREFIX" ]; then - if [ "$Edition" = "Trolltech" ]; then + if [ "$CFG_DEV" = "yes" ]; then QT_INSTALL_PREFIX="$outpath" # At Trolltech, we use sandboxed builds by default elif [ "$PLATFORM_QWS" = "yes" ]; then QT_INSTALL_PREFIX="/usr/local/Trolltech/QtEmbedded-${QT_VERSION}" @@ -2786,26 +3049,28 @@ if [ "$OPT_HELP" = "yes" ]; then fi cat <<EOF -Usage: $relconf [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir <dir>] +Usage: $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir <dir>] [-docdir <dir>] [-headerdir <dir>] [-plugindir <dir> ] [-datadir <dir>] [-translationdir <dir>] [-sysconfdir <dir>] [-examplesdir <dir>] [-demosdir <dir>] [-buildkey <key>] [-release] [-debug] - [-debug-and-release] [-shared] [-static] [-no-fast] [-fast] [-no-largefile] + [-debug-and-release] [-developer-build] [-shared] [-static] [-no-fast] [-fast] [-no-largefile] [-largefile] [-no-exceptions] [-exceptions] [-no-accessibility] [-accessibility] [-no-stl] [-stl] [-no-sql-<driver>] [-sql-<driver>] [-plugin-sql-<driver>] [-system-sqlite] [-no-qt3support] [-qt3support] [-platform] [-D <string>] [-I <string>] [-L <string>] [-help] - [-qt-zlib] [-system-zlib] [-no-gif] [-qt-gif] [-no-libtiff] [-system-libtiff] + [-qt-zlib] [-system-zlib] [-no-gif] [-qt-gif] [-no-libtiff] [-qt-libtiff] [-system-libtiff] [-no-libpng] [-qt-libpng] [-system-libpng] [-no-libmng] [-qt-libmng] [-system-libmng] [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg] [-make <part>] [-no-make <part>] [-R <string>] [-l <string>] [-no-rpath] [-rpath] [-continue] [-verbose] [-v] [-silent] [-no-nis] [-nis] [-no-cups] [-cups] [-no-iconv] [-iconv] [-no-pch] [-pch] [-no-dbus] [-dbus] [-dbus-linked] [-no-separate-debug-info] [-no-mmx] [-no-3dnow] [-no-sse] [-no-sse2] - [-qtnamespace <namespace>] [-separate-debug-info] [-armfpa] + [-qtnamespace <namespace>] [-qtlibinfix <infix>] [-separate-debug-info] [-armfpa] [-no-optimized-qmake] [-optimized-qmake] [-no-xmlpatterns] [-xmlpatterns] - [-no-phonon] [-phonon-backend] [-no-phonon-backend] [-phonon-backend] [-no-svg] - [-svg] [-no-webkit] [-webkit] [-no-assistant-webkit] [-assistant-webkit] + [-no-phonon] [-phonon] [-no-phonon-backend] [-phonon-backend] + [-no-openssl] [-openssl] [-openssl-linked] + [-no-gtkstyle] [-gtkstyle] [-no-svg] [-svg] [-no-webkit] [-webkit] + [-no-scripttools] [-scripttools] [additional platform specific options (see below)] @@ -2875,6 +3140,12 @@ Configure options: -debug-and-release . Compile and link two versions of Qt, with and without debugging turned on (Mac only). + -developer-build.... Compile and link Qt with Qt developer options (including auto-tests exporting) + + -opensource......... Compile and link the Open-Source Edition of Qt. + -commercial......... Compile and link the Commercial Edition of Qt. + + * -shared ............ Create and use shared Qt libraries. -static ............ Create and use static Qt libraries. @@ -2927,8 +3198,8 @@ fi -no-qt3support ..... Disables the Qt 3 support functionality. * -qt3support ........ Enables the Qt 3 support functionality. - -no-xmlpatterns..... Do not build the QtXmlPatterns module. - + -xmlpatterns........ Build the QtXmlPatterns module. + -no-xmlpatterns .... Do not build the QtXmlPatterns module. + + -xmlpatterns ....... Build the QtXmlPatterns module. QtXmlPatterns is built if a decent C++ compiler is used and exceptions are enabled. @@ -2944,17 +3215,24 @@ fi -no-webkit ......... Do not build the WebKit module. + -webkit ............ Build the WebKit module. WebKit is built if a decent C++ compiler is used. - - * -no-assistant-webkit Do not use WebKit as the html rendering engine in - Assistant. - -assistant-webkit Use WebKit as html rendering engine in Assistant. - This is only available if the WebKit module is built. + + -no-scripttools .... Do not build the QtScriptTools module. + + -scripttools ....... Build the QtScriptTools module. -platform target ... The operating system and compiler you are building on ($PLATFORM). See the README file for a list of supported operating systems and compilers. +EOF +if [ "${PLATFORM_QWS}" != "yes" ]; then +cat << EOF + -graphicssystem <sys> Sets an alternate graphics system. Available options are: + raster - Software rasterizer + opengl - Rendering via OpenGL, Experimental! +EOF +fi +cat << EOF -no-mmx ............ Do not compile with use of MMX instructions. -no-3dnow .......... Do not compile with use of 3DNOW instructions. @@ -3004,6 +3282,9 @@ Third Party Libraries: + -openssl ........... Enable run-time OpenSSL support. -openssl-linked .... Enabled linked OpenSSL support. + -ptmalloc .......... Override the system memory allocator with ptmalloc. + (Experimental.) + Additional options: -make <part> ....... Add part to the list of parts to be built at make time. @@ -3036,6 +3317,7 @@ Additional options: $CUN -no-cups ........... Do not compile CUPS support. $CUY -cups .............. Compile CUPS support. + Requires cups/cups.h and libcups.so.2. $CIN -no-iconv .......... Do not compile support for iconv(3). $CIY -iconv ............. Compile support for iconv(3). @@ -3045,7 +3327,7 @@ Additional options: $DBN -no-dbus ........... Do not compile the QtDBus module. $DBY -dbus .............. Compile the QtDBus module and dynamically load libdbus-1. - -dbus-linked........ Compile the QtDBus module and link to libdbus-1. + -dbus-linked ....... Compile the QtDBus module and link to libdbus-1. -reduce-relocations ..... Reduce relocations in the libraries through extra linker optimizations (Qt/X11 and Qt for Embedded Linux only; @@ -3095,11 +3377,11 @@ if [ "$PLATFORM_X11" = "yes" ]; then SHN=" " fi if [ "$CFG_XINERAMA" = "no" ]; then - XRY=" " - XRN="*" + XAY=" " + XAN="*" else - XRY="*" - XRN=" " + XAY="*" + XAN=" " fi if [ "$CFG_FONTCONFIG" = "no" ]; then FCGY=" " @@ -3115,6 +3397,13 @@ if [ "$PLATFORM_X11" = "yes" ]; then XCY="*" XCN=" " fi + if [ "$CFG_XFIXES" = "no" ]; then + XFY=" " + XFN="*" + else + XFY="*" + XFN=" " + fi if [ "$CFG_XRANDR" = "no" ]; then XZY=" " XZN="*" @@ -3129,7 +3418,14 @@ if [ "$PLATFORM_X11" = "yes" ]; then XRY="*" XRN=" " fi - if [ "$CFG_TABLET" = "no" ]; then + if [ "$CFG_MITSHM" = "no" ]; then + XMY=" " + XMN="*" + else + XMY="*" + XMN=" " + fi + if [ "$CFG_XINPUT" = "no" ]; then XIY=" " XIN="*" else @@ -3154,12 +3450,22 @@ if [ "$PLATFORM_X11" = "yes" ]; then Qt/X11 only: + -no-gtkstyle ....... Do not build the GTK theme integration. + + -gtkstyle .......... Build the GTK theme integration. + * -no-nas-sound ...... Do not compile in NAS sound support. -system-nas-sound .. Use NAS libaudio from the operating system. See http://radscan.com/nas.html -no-opengl ......... Do not support OpenGL. - + -opengl ............ Enable OpenGL support. + + -opengl <api> ...... Enable OpenGL support. + With no parameter, this will auto-detect the "best" + OpenGL API to use. If desktop OpenGL is avaliable, it + will be used. Use desktop, es1, es1cl or es2 for <api> + to force the use of the Desktop (OpenGL 1.x or 2.x), + OpenGL ES 1.x Common profile, 1.x Common Lite profile + or 2.x APIs instead. On X11, the EGL API will be used + to manage GL contexts in the case of OpenGL ES. $SMN -no-sm ............. Do not support X Session Management. $SMY -sm ................ Support X Session Management, links in -lSM -lICE. @@ -3168,8 +3474,8 @@ Qt/X11 only: $SHY -xshape ............ Compile XShape support. Requires X11/extensions/shape.h. - $XRN -no-xinerama ....... Do not compile Xinerama (multihead) support. - $XRY -xinerama .......... Compile Xinerama support. + $XAN -no-xinerama ....... Do not compile Xinerama (multihead) support. + $XAY -xinerama .......... Compile Xinerama support. Requires X11/extensions/Xinerama.h and libXinerama. By default, Xinerama support will be compiled if available and the shared libraries are dynamically @@ -3182,8 +3488,8 @@ Qt/X11 only: available and the shared libraries are dynamically loaded at runtime. - $XCN -no-xfixes ......... Do not compile Xfixes support. - $XCY -xfixes ............ Compile Xfixes support. + $XFN -no-xfixes ......... Do not compile Xfixes support. + $XFY -xfixes ............ Compile Xfixes support. Requires X11/extensions/Xfixes.h and libXfixes. By default, Xfixes support will be compiled if available and the shared libraries are dynamically @@ -3195,16 +3501,20 @@ Qt/X11 only: $XRN -no-xrender ........ Do not compile Xrender support. $XRY -xrender ........... Compile Xrender support. - Requires X11/extensions/Xrender.h and libXrender + Requires X11/extensions/Xrender.h and libXrender. + + $XMN -no-mitshm ......... Do not compile MIT-SHM support. + $XMY -mitshm ............ Compile MIT-SHM support. + Requires sys/ipc.h, sys/shm.h and X11/extensions/XShm.h $FCGN -no-fontconfig ..... Do not compile FontConfig (anti-aliased font) support. $FCGY -fontconfig ........ Compile FontConfig support. Requires fontconfig/fontconfig.h, libfontconfig, freetype.h and libfreetype. - $XIN -no-tablet ......... Do not compile Tablet support. - $XIY -tablet ............ Compile Tablet support. - Requires IRIX with wacom.h and libXi or + $XIN -no-xinput.......... Do not compile Xinput support. + $XIY -xinput ............ Compile Xinput support. This also enabled tablet support + which requires IRIX with wacom.h and libXi or XFree86 with X11/extensions/XInput.h and libXi. $XKN -no-xkb ............ Do not compile XKB (X KeyBoard extension) support. @@ -3221,17 +3531,24 @@ Qt/Mac only: -Fstring ........... Add an explicit framework path. -fw string ......... Add an explicit framework. + -cocoa ............. Build the Cocoa version of Qt. Note that -no-framework + and -static is not supported with -cocoa. Specifying + this option creates Qt binaries that requires Mac OS X + 10.5 or higher. + * -framework ......... Build Qt as a series of frameworks and link tools against those frameworks. -no-framework ...... Do not build Qt as a series of frameworks. - -dwarf2 ............ Enable dwarf2 debugging symbols. - * -no-dwarf2 ......... Disable dwarf2 debugging symbols. + * -dwarf2 ............ Enable dwarf2 debugging symbols. + -no-dwarf2 ......... Disable dwarf2 debugging symbols. -universal ......... Equivalent to -arch "ppc x86" -arch <arch> ....... Build Qt for <arch> Example values for <arch>: x86 ppc x86_64 ppc64 + Multiple -arch arguments can be specified, 64-bit archs + will be built with the Cocoa framework. -sdk <sdk> ......... Build Qt using Apple provided SDK <sdk>. This option requires gcc 4. To use a different SDK with gcc 3.3, set the SDKROOT environment variable. @@ -3272,7 +3589,7 @@ Qt for Embedded Linux only: -no-freetype ........ Do not compile in Freetype2 support. -qt-freetype ........ Use the libfreetype bundled with Qt. - * -system-libfreetype. Use libfreetype from the operating system. + * -system-freetype .... Use libfreetype from the operating system. See http://www.freetype.org/ -qconfig local ...... Use src/corelib/global/qconfig-local.h rather than the @@ -3290,6 +3607,14 @@ Qt for Embedded Linux only: -no-decoration-<style> ....Disable decoration <style> entirely. Possible values for <style>: [ $CFG_DECORATION_AVAILABLE ] + -no-opengl .......... Do not support OpenGL. + -opengl <api> ....... Enable OpenGL ES support + With no parameter, this will attempt to auto-detect OpenGL ES 1.x + or 2.x. Use es1, es1cl or es2 for <api> to override auto-detection. + + NOTE: A QGLScreen driver for the hardware is required to support + OpenGL ES on Qt for Embedded Linux. + -qt-gfx-<driver> ... Enable a graphics <driver> in the QtGui library. Possible values for <driver>: [ $CFG_GFX_AVAILABLE ] -plugin-gfx-<driver> Enable graphics <driver> as a plugin to be @@ -3301,7 +3626,7 @@ Qt for Embedded Linux only: -qt-kbd-<driver> ... Enable a keyboard <driver> in the QtGui library. Possible values for <driver>: [ $CFG_KBD_AVAILABLE ] - -plugin-kbd-<driver> Enable keyboard <driver> as a plugin to be linked to + -plugin-kbd-<driver> Enable keyboard <driver> as a plugin to be linked to at runtime. Possible values for <driver>: [ $CFG_KBD_PLUGIN_AVAILABLE ] @@ -3310,7 +3635,7 @@ Qt for Embedded Linux only: -qt-mouse-<driver> ... Enable a mouse <driver> in the QtGui library. Possible values for <driver>: [ $CFG_MOUSE_AVAILABLE ] - -plugin-mouse-<driver> Enable mouse <driver> as a plugin to be linked to + -plugin-mouse-<driver> Enable mouse <driver> as a plugin to be linked to at runtime. Possible values for <driver>: [ $CFG_MOUSE_PLUGIN_AVAILABLE ] -no-mouse-<driver> ... Disable mouse <driver> entirely. @@ -3347,62 +3672,37 @@ fi # Help # LICENSING, INTERACTIVE PART # ----------------------------------------------------------------------------- -if [ "$Edition" = "Qtopia" ]; then - TheLicense=`head -n 1 "$relpath/LICENSE.Qtopia"` - while true; do - if [ "$OPT_CONFIRM_LICENSE" = "yes" ]; then - echo "You have already accepted the terms of the $TheLicense license." - acceptance=yes - else - echo "You are licensed to use this software under the terms of" - echo "the $TheLicense" - echo - echo "Type '?' to read the $TheLicense" - echo "Type 'yes' to accept this license offer." - echo "Type 'no' to decline this license offer." - echo - if echo '\c' | grep '\c' >/dev/null; then - echo -n "Do you accept the terms of the license? " - else - echo "Do you accept the terms of the license? \c" - fi - read acceptance - fi - echo - if [ "$acceptance" = "yes" ]; then - break - elif [ "$acceptance" = "no" ] ;then - echo "You are not licensed to use this software." - echo - exit 0 - elif [ "$acceptance" = "?" ]; then - more "$relpath/LICENSE.Qtopia" - fi - done +if [ "$PLATFORM_QWS" = "yes" ]; then + Platform="Qt for Embedded Linux" +elif [ "$PLATFORM_MAC" = "yes" ]; then + Platform="Qt/Mac" +else + PLATFORM_X11=yes + Platform="Qt/X11" +fi + +echo +echo "This is the $Platform ${EditionString} Edition." +echo + +if [ "$Edition" = "NokiaInternalBuild" ]; then + echo "Detected -nokia-developer option" + echo "Nokia employees and agents are allowed to use this software under" + echo "the authority of Nokia Corporation and/or its subsidiary(-ies)" elif [ "$Edition" = "OpenSource" ]; then while true; do - if [ "$PLATFORM_QWS" = "yes" ]; then - echo "You are licensed to use this software under the terms of" - echo "the GNU General Public License (GPL) versions 2 or 3." - echo - affix="either" - elif [ "$PLATFORM_MAC" = "yes" ]; then - echo "You are licensed to use this software under the terms of" - echo "the GNU General Public License (GPL) versions 2 or 3." - echo - affix="either" - elif [ "$PLATFORM_X11" = "yes" ]; then - echo "You are licensed to use this software under the terms of" - echo "the GNU General Public License (GPL) versions 2 or 3." - echo - affix="either" - fi + echo "You are licensed to use this software under the terms of" + echo "the GNU General Public License (GPL) versions 3." + echo "You are also licensed to use this software under the terms of" + echo "the Lesser GNU General Public License (LGPL) versions 2.1." + echo + affix="either" if [ "$OPT_CONFIRM_LICENSE" = "yes" ]; then echo "You have already accepted the terms of the $LicenseType license." acceptance=yes else - echo "Type '2' to view the GNU General Public License version 2." echo "Type '3' to view the GNU General Public License version 3." + echo "Type 'L' to view the Lesser GNU General Public License version 2.1." echo "Type 'yes' to accept this license offer." echo "Type 'no' to decline this license offer." echo @@ -3420,21 +3720,15 @@ elif [ "$Edition" = "OpenSource" ]; then echo "You are not licensed to use this software." echo exit 1 - elif [ "$acceptance" = "2" ]; then - more "$relpath/LICENSE.GPL2" elif [ "$acceptance" = "3" ]; then more "$relpath/LICENSE.GPL3" + elif [ "$acceptance" = "L" ]; then + more "$relpath/LICENSE.LGPL" fi done elif [ "$Edition" = "Preview" ]; then + TheLicense=`head -n 1 "$relpath/LICENSE.PREVIEW.COMMERCIAL"` while true; do - if [ "$QT_EDITION" = "QT_EDITION_OPENSOURCE" ]; then - TheLicense=`head -n 1 "$relpath/LICENSE.PREVIEW.OPENSOURCE"` - else - TheLicense=`head -n 1 "$relpath/LICENSE.PREVIEW.COMMERCIAL"` - fi - - TheLicense=`echo $TheLicense | sed -e "s, *, ,g" -e "s,^ *,," -e "s, *$,,"` if [ "$OPT_CONFIRM_LICENSE" = "yes" ]; then echo "You have already accepted the terms of the $LicenseType license." @@ -3462,59 +3756,10 @@ elif [ "$Edition" = "Preview" ]; then echo exit 0 elif [ "$acceptance" = "?" ]; then - if [ "$QT_EDITION" = "QT_EDITION_OPENSOURCE" ]; then - more "$relpath/LICENSE.PREVIEW.OPENSOURCE" - else - more "$relpath/LICENSE.PREVIEW.COMMERCIAL" - fi - fi - done -elif [ "$Edition" = "Snapshot" ]; then - while true; do - if [ "$QT_EDITION" = "QT_EDITION_OPENSOURCE" ]; then - TheLicense=`head -n 1 "$relpath/LICENSE.SNAPSHOT.OPENSOURCE.GPL2"` - else - TheLicense=`head -n 1 "$relpath/LICENSE.SNAPSHOT.COMMERCIAL"` - fi - - TheLicense=`echo $TheLicense | sed -e "s, *, ,g" -e "s,^ *,," -e "s, *$,,"` - - if [ "$OPT_CONFIRM_LICENSE" = "yes" ]; then - echo "You have already accepted the terms of the $LicenseType license." - acceptance=yes - else - echo "You are licensed to use this software under the terms of" - echo "the $TheLicense" - echo - test -f "$relpath/LICENSE.SNAPSHOT.COMMERCIAL" && echo "Type '?' to read the Snapshot License." - test -f "$relpath/LICENSE.SNAPSHOT.OPENSOURCE.GPL2" && echo "Type '2' to view the GNU General Public License version 2." - test -f "$relpath/LICENSE.SNAPSHOT.OPENSOURCE.GPL2" && echo "Type '3' to view the GNU General Public License version 3." - echo "Type 'yes' to accept this license offer." - echo "Type 'no' to decline this license offer." - echo - if echo '\c' | grep '\c' >/dev/null; then - echo -n "Do you accept the terms of the license? " - else - echo "Do you accept the terms of the license? \c" - fi - read acceptance - fi - echo - if [ "$acceptance" = "yes" ]; then - break - elif [ "$acceptance" = "no" ] ;then - echo "You are not licensed to use this software." - echo - exit 0 - elif [ "$acceptance" = "?" ]; then - more "$relpath/LICENSE.SNAPSHOT.COMMERCIAL" - elif [ "$acceptance" = "2" ]; then - more "$relpath/LICENSE.SNAPSHOT.OPENSOURCE.GPL2" - elif [ "$acceptance" = "3" ]; then - more "$relpath/LICENSE.SNAPSHOT.OPENSOURCE.GPL3" + more "$relpath/LICENSE.PREVIEW.COMMERCIAL" fi done -elif [ "$Edition" != "Trolltech" ]; then +elif [ "$Edition" != "OpenSource" ]; then if [ -n "$ExpiryDate" ]; then ExpiryDate=`echo $ExpiryDate | sed -e "s,-,,g" | tr -d "\n\r"` [ -z "$ExpiryDate" ] && ExpiryDate="0" @@ -3728,22 +3973,16 @@ fi # ----------------------------------------------------------------------------- # symlink includes -if [ -x "/usr/bin/perl" ] && [ -x "$relpath/bin/syncqt" ]; then +if [ -n "$PERL" ] && [ -x "$relpath/bin/syncqt" ]; then SYNCQT_OPTS= - [ "$Edition" = "Trolltech" ] && SYNCQT_OPTS="$SYNCQT_OPTS -check-includes" + [ "$CFG_DEV" = "yes" ] && SYNCQT_OPTS="$SYNCQT_OPTS -check-includes" if [ "$OPT_SHADOW" = "yes" ]; then - "$outpath/bin/syncqt" $SYNCQT_OPTS - elif [ "$Edition" = "Trolltech" ]; then - QTDIR="$relpath" perl "$outpath/bin/syncqt" $SYNCQT_OPTS + "$outpath/bin/syncqt" $SYNCQT_OPTS + elif [ "$CFG_DEV" = "yes" ] || [ ! -d $relpath/include ]; then + QTDIR="$relpath" perl "$outpath/bin/syncqt" $SYNCQT_OPTS fi fi -if [ "$OPT_SHADOW" = "yes" ]; then - # we are doing a shadow build, so we need to use the includes from - # $outpath/include as well - QMakeVar add INCLUDEPATH "\"${outpath}/include\"" -fi - # $1: variable name # $2: optional transformation # relies on $QMAKESPEC, $COMPILER_CONF and $mkfile being set correctly, as the latter @@ -3819,7 +4058,7 @@ if false; then ###[ '!' -f "$outpath/bin/qmake" ]; in_mkfile="$relpath/qmake/$in_mkfile" mkfile="$outpath/qmake/$mkfile" if [ -f "$mkfile" ]; then - [ "$Edition" = "Trolltech" ] && "$WHICH" chflags >/dev/null 2>&1 && chflags nouchg "$mkfile" + [ "$CFG_DEV" = "yes" ] && "$WHICH" chflags >/dev/null 2>&1 && chflags nouchg "$mkfile" rm -f "$mkfile" fi [ -f "$in_mkfile" ] || continue @@ -3885,16 +4124,16 @@ if false; then ###[ '!' -f "$outpath/bin/qmake" ]; EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)" EXTRA_OBJS="qsettings_mac.o qcore_mac.o" EXTRA_SRCS="\"$relpath/src/corelib/io/qsettings_mac.cpp\" \"$relpath/src/corelib/kernel/qcore_mac.cpp\"" - if echo "$CFG_MAC_ARCHS" | grep x86 > /dev/null 2>&1; then - X86_CFLAGS=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CFLAGS_X86[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1,"` - X86_LFLAGS=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_LFLAGS_X86[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1,"` + if echo "$CFG_MAC_ARCHS" | grep x86 > /dev/null 2>&1; then # matches both x86 and x86_64 + X86_CFLAGS="-arch i386" + X86_LFLAGS="-arch i386" EXTRA_CFLAGS="$X86_CFLAGS $EXTRA_CFLAGS" EXTRA_CXXFLAGS="$X86_CFLAGS $EXTRA_CXXFLAGS" EXTRA_LFLAGS="$EXTRA_LFLAGS $X86_LFLAGS" fi - if echo "$CFG_MAC_ARCHS" | grep ppc > /dev/null 2>&1; then - PPC_CFLAGS=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CFLAGS_PPC[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1,"` - PPC_LFLAGS=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_LFLAGS_PPC[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1,"` + if echo "$CFG_MAC_ARCHS" | grep ppc > /dev/null 2>&1; then # matches both ppc and ppc64 + PPC_CFLAGS="-arch ppc" + PPC_LFLAGS="-arch ppc" EXTRA_CFLAGS="$PPC_CFLAGS $EXTRA_CFLAGS" EXTRA_CXXFLAGS="$PPC_CFLAGS $EXTRA_CXXFLAGS" EXTRA_LFLAGS="$EXTRA_LFLAGS $PPC_LFLAGS" @@ -4013,7 +4252,7 @@ if [ "$CFG_ZLIB" = "no" ]; then ZLIB_FORCED=yes fi if [ "$CFG_ZLIB" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/zlib "zlib" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/zlib "zlib" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then CFG_ZLIB=system else CFG_ZLIB=yes @@ -4030,7 +4269,7 @@ if [ "$CFG_JPEG" = "auto" ]; then fi # detect jpeg if [ "$CFG_LIBJPEG" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libjpeg "libjpeg" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libjpeg "libjpeg" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then CFG_LIBJPEG=system else CFG_LIBJPEG=qt @@ -4057,7 +4296,7 @@ fi # detect tiff if [ "$CFG_LIBTIFF" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libtiff "libtiff" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libtiff "libtiff" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then CFG_LIBTIFF=system else CFG_LIBTIFF=qt @@ -4074,7 +4313,7 @@ if [ "$CFG_MNG" = "auto" ]; then fi # detect mng if [ "$CFG_LIBMNG" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libmng "libmng" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libmng "libmng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then CFG_LIBMNG=system else CFG_LIBMNG=qt @@ -4083,7 +4322,7 @@ fi # detect png if [ "$CFG_LIBPNG" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then CFG_LIBPNG=system else CFG_LIBPNG=qt @@ -4122,13 +4361,13 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do QT_CFLAGS_MYSQL="" fi else - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mysql_r "MySQL (thread-safe)" $QT_LFLAGS_MYSQL_R $L_FLAGS $QT_CFLAGS_MYSQL $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mysql_r "MySQL (thread-safe)" $QT_LFLAGS_MYSQL_R $L_FLAGS $QT_CFLAGS_MYSQL $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then QMakeVar add CONFIG use_libmysqlclient_r if [ "$CFG_SQL_mysql" = "auto" ]; then CFG_SQL_mysql=plugin fi QT_LFLAGS_MYSQL="$QT_LFLAGS_MYSQL_R" - elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mysql "MySQL (thread-unsafe)" $QT_LFLAGS_MYSQL $L_FLAGS $QT_CFLAGS_MYSQL $I_FLAGS $l_FLAGS; then + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mysql "MySQL (thread-unsafe)" $QT_LFLAGS_MYSQL $L_FLAGS $QT_CFLAGS_MYSQL $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then if [ "$CFG_SQL_mysql" = "auto" ]; then CFG_SQL_mysql=plugin fi @@ -4154,11 +4393,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do if "$WHICH" pg_config >/dev/null 2>&1; then QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` - QT_LIBS_PSQL=`pg_config --libs 2>/dev/null` fi [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" - [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL $QT_LIBS_PSQL" - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS; then + [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then if [ "$CFG_SQL_psql" = "auto" ]; then CFG_SQL_psql=plugin fi @@ -4179,7 +4417,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do ;; odbc) if [ "$CFG_SQL_odbc" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then if [ "$CFG_SQL_odbc" = "auto" ]; then CFG_SQL_odbc=plugin fi @@ -4198,7 +4436,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do ;; oci) if [ "$CFG_SQL_oci" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/oci "OCI" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/oci "OCI" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then if [ "$CFG_SQL_oci" = "auto" ]; then CFG_SQL_oci=plugin fi @@ -4217,7 +4455,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do ;; tds) if [ "$CFG_SQL_tds" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then if [ "$CFG_SQL_tds" = "auto" ]; then CFG_SQL_tds=plugin fi @@ -4236,7 +4474,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do ;; db2) if [ "$CFG_SQL_db2" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/db2 "DB2" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/db2 "DB2" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then if [ "$CFG_SQL_db2" = "auto" ]; then CFG_SQL_db2=plugin fi @@ -4255,7 +4493,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do ;; ibase) if [ "$CFG_SQL_ibase" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ibase "InterBase" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ibase "InterBase" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then if [ "$CFG_SQL_ibase" = "auto" ]; then CFG_SQL_ibase=plugin fi @@ -4274,7 +4512,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do ;; sqlite2) if [ "$CFG_SQL_sqlite2" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite2 "SQLite2" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite2 "SQLite2" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then if [ "$CFG_SQL_sqlite2" = "auto" ]; then CFG_SQL_sqlite2=plugin fi @@ -4299,7 +4537,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null` QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null` fi - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then if [ "$CFG_SQL_sqlite" = "auto" ]; then CFG_SQL_sqlite=plugin fi @@ -4336,7 +4574,7 @@ done # auto-detect NIS support if [ "$CFG_NIS" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/nis "NIS" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/nis "NIS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then CFG_NIS=yes else if [ "$CFG_NIS" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -4353,7 +4591,7 @@ fi # auto-detect CUPS support if [ "$CFG_CUPS" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/cups "Cups" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/cups "Cups" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then CFG_CUPS=yes else if [ "$CFG_CUPS" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -4372,9 +4610,9 @@ fi if [ "$CFG_ICONV" != "no" ]; then if [ "$PLATFORM_QWS" = "yes" ]; then CFG_ICONV=no - elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS; then + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then CFG_ICONV=yes - elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/gnu-libiconv" "GNU libiconv" $L_FLAGS $I_FLAGS $l_FLAGS; then + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/gnu-libiconv" "GNU libiconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then CFG_ICONV=gnu else if [ "$CFG_ICONV" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -4395,7 +4633,7 @@ if [ "$CFG_DBUS" != "no" ]; then QT_CFLAGS_DBUS=`$PKG_CONFIG --cflags dbus-1 2>/dev/null` QT_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null` fi - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/dbus "D-Bus" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_DBUS $QT_LIBS_DBUS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/dbus "D-Bus" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_DBUS $QT_LIBS_DBUS $MAC_ARCHS_COMMANDLINE; then [ "$CFG_DBUS" = "auto" ] && CFG_DBUS=yes QMakeVar set QT_CFLAGS_DBUS "$QT_CFLAGS_DBUS" QMakeVar set QT_LIBS_DBUS "$QT_LIBS_DBUS" @@ -4414,6 +4652,82 @@ if [ "$CFG_DBUS" != "no" ]; then fi fi +# Generate a CRC of the namespace for using in constants for the Carbon port. +# This should mean that you really *can* load two Qt's and have our custom +# Carbon events work. +if [ "$PLATFORM_MAC" = "yes" -a ! -z "$QT_NAMESPACE" ]; then + QT_NAMESPACE_MAC_CRC=`"$mactests/crc.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/mac/crc $QT_NAMESPACE $L_FLAGS $I_FLAGS $l_FLAGS` +fi + +if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then + # auto-detect Glib support + if [ "$CFG_GLIB" != "no" ]; then + if [ -n "$PKG_CONFIG" ]; then + QT_CFLAGS_GLIB=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0 2>/dev/null` + QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null` + fi + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/glib "Glib" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_GLIB $QT_LIBS_GLIB $X11TESTS_FLAGS ; then + CFG_GLIB=yes + QMakeVar set QT_CFLAGS_GLIB "$QT_CFLAGS_GLIB" + QMakeVar set QT_LIBS_GLIB "$QT_LIBS_GLIB" + else + if [ "$CFG_GLIB" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then + echo "Glib support cannot be enabled due to functionality tests!" + echo " Turn on verbose messaging (-v) to $0 to see the final report." + echo " If you believe this message is in error you may use the continue" + echo " switch (-continue) to $0 to continue." + exit 101 + else + CFG_GLIB=no + fi + fi + fi + + if [ "$CFG_PHONON" != "no" ]; then + if [ "$CFG_PHONON_BACKEND" != "no" ]; then + if [ "$CFG_GLIB" = "yes" -a "$CFG_GSTREAMER" != "no" ]; then + if [ -n "$PKG_CONFIG" ]; then + QT_CFLAGS_GSTREAMER=`$PKG_CONFIG --cflags gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null` + QT_LIBS_GSTREAMER=`$PKG_CONFIG --libs gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null` + fi + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/gstreamer "GStreamer" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_GSTREAMER $QT_LIBS_GSTREAMER $X11TESTS_FLAGS; then + CFG_GSTREAMER=yes + QMakeVar set QT_CFLAGS_GSTREAMER "$QT_CFLAGS_GSTREAMER" + QMakeVar set QT_LIBS_GSTREAMER "$QT_LIBS_GSTREAMER" + else + if [ "$CFG_GSTREAMER" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then + echo "Gstreamer support cannot be enabled due to functionality tests!" + echo " Turn on verbose messaging (-v) to $0 to see the final report." + echo " If you believe this message is in error you may use the continue" + echo " switch (-continue) to $0 to continue." + exit 101 + else + CFG_GSTREAMER=no + fi + fi + elif [ "$CFG_GLIB" = "no" ]; then + CFG_GSTREAMER=no + fi + + if [ "$CFG_GSTREAMER" = "yes" ]; then + CFG_PHONON=yes + else + if [ "$CFG_PHONON" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then + echo "Phonon support cannot be enabled due to functionality tests!" + echo " Turn on verbose messaging (-v) to $0 to see the final report." + echo " If you believe this message is in error you may use the continue" + echo " switch (-continue) to $0 to continue." + exit 101 + else + CFG_PHONON=no + fi + fi + else + CFG_PHONON=yes + fi + fi +fi # X11/QWS + # x11 if [ "$PLATFORM_X11" = "yes" ]; then x11tests="$relpath/config.tests/x11" @@ -4427,13 +4741,99 @@ if [ "$PLATFORM_X11" = "yes" ]; then X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive" fi - # auto-detect OpenGL support - if [ "$CFG_OPENGL" = "auto" ]; then + # Check we actually have X11 :-) +# Requires X11 environment, disable test +# if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then +# echo "Basic XLib functionality test failed!" +# echo " You might need to modify the include and library search paths by editing" +# echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}." +# exit 1 +# fi + + # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x) + if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then - CFG_OPENGL=yes + CFG_OPENGL=desktop + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS; then + CFG_OPENGL=es2 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then + CFG_OPENGL=es1 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1cl "OpenGL ES 1.x Lite" $L_FLAGS $I_FLAGS $l_FLAGS; then + CFG_OPENGL=es1cl else + if [ "$CFG_OPENGL" = "yes" ]; then + echo "All the OpenGL functionality tests failed!" + echo " You might need to modify the include and library search paths by editing" + echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in" + echo " ${XQMAKESPEC}." + exit 1 + fi CFG_OPENGL=no fi + case "$PLATFORM" in + hpux*) + # HP-UX have buggy glx headers; check if we really need to define the GLXFBConfig struct. + if [ "$CFG_OPENGL" = "desktop" ]; then + if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/glxfbconfig "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + QMakeVar add DEFINES QT_DEFINE_GLXFBCONFIG_STRUCT + fi + fi + ;; + *) + ;; + esac + elif [ "$CFG_OPENGL" = "es1cl" ]; then + # OpenGL ES 1.x common lite + if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1cl "OpenGL ES 1.x Lite" $L_FLAGS $I_FLAGS $l_FLAGS; then + echo "The OpenGL ES 1.x Common Lite Profile functionality test failed!" + echo " You might need to modify the include and library search paths by editing" + echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in" + echo " ${XQMAKESPEC}." + exit 1 + fi + elif [ "$CFG_OPENGL" = "es1" ]; then + # OpenGL ES 1.x + if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then + echo "The OpenGL ES 1.x functionality test failed!" + echo " You might need to modify the include and library search paths by editing" + echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in" + echo " ${XQMAKESPEC}." + exit 1 + fi + elif [ "$CFG_OPENGL" = "es2" ]; then + #OpenGL ES 2.x + if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS; then + echo "The OpenGL ES 2.0 functionality test failed!" + echo " You might need to modify the include and library search paths by editing" + echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in" + echo " ${XQMAKESPEC}." + exit 1 + fi + elif [ "$CFG_OPENGL" = "desktop" ]; then + # Desktop OpenGL support + if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + echo "The OpenGL functionality test failed!" + echo " You might need to modify the include and library search paths by editing" + echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in" + echo " ${XQMAKESPEC}." + exit 1 + fi + case "$PLATFORM" in + hpux*) + # HP-UX have buggy glx headers; check if we really need to define the GLXFBConfig struct. + if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/glxfbconfig "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + QMakeVar add DEFINES QT_DEFINE_GLXFBCONFIG_STRUCT + fi + ;; + *) + ;; + esac + fi + + # if opengl is disabled and the user specified graphicssystem gl, disable it... + if [ "$CFG_GRAPHICS_SYSTEM" = "opengl" ] && [ "$CFG_OPENGL" = "no" ]; then + echo "OpenGL Graphics System is disabled due to missing OpenGL support..." + CFG_GRAPHICS_SYSTEM=default fi # auto-detect Xcursor support @@ -4477,7 +4877,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then # auto-detect Xrandr support (resize and rotate extension) if [ "$CFG_XRANDR" != "no" ]; then if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xrandr "Xrandr" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + if [ "$CFG_XRANDR" != "runtime" ]; then CFG_XRANDR=yes + fi else if [ "$CFG_XRANDR" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then echo "Xrandr support cannot be enabled due to functionality tests!" @@ -4508,11 +4910,36 @@ if [ "$PLATFORM_X11" = "yes" ]; then fi fi + # auto-detect MIT-SHM support + if [ "$CFG_MITSHM" != "no" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/mitshm "mitshm" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + CFG_MITSHM=yes + else + if [ "$CFG_MITSHM" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then + echo "MITSHM support cannot be enabled due to functionality tests!" + echo " Turn on verbose messaging (-v) to $0 to see the final report." + echo " If you believe this message is in error you may use the continue" + echo " switch (-continue) to $0 to continue." + exit 101 + else + CFG_MITSHM=no + fi + fi + fi + # auto-detect FontConfig support if [ "$CFG_FONTCONFIG" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/fontconfig "FontConfig" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists fontconfig 2>/dev/null; then + QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig 2>/dev/null` + QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig 2>/dev/null` + else + QT_CFLAGS_FONTCONFIG= + QT_LIBS_FONTCONFIG="-lfreetype -lfontconfig" + fi + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/fontconfig "FontConfig" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS $QT_CFLAGS_FONTCONFIG $QT_LIBS_FONTCONFIG; then CFG_FONTCONFIG=yes - QMakeVar set QMAKE_LIBS_X11 '-lfreetype -lfontconfig $$QMAKE_LIBS_X11' + QMakeVar set QMAKE_CFLAGS_X11 "$QT_CFLAGS_FONTCONFIG \$\$QMAKE_CFLAGS_X11" + QMakeVar set QMAKE_LIBS_X11 "$QT_LIBS_FONTCONFIG \$\$QMAKE_LIBS_X11" CFG_LIBFREETYPE=system else if [ "$CFG_FONTCONFIG" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -4580,19 +5007,21 @@ if [ "$PLATFORM_X11" = "yes" ]; then fi fi - # auto-detect tablet support (currenlty only in IRIX) - if [ "$CFG_TABLET" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xinput "Tablet (XInput)" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then - CFG_TABLET=yes + # auto-detect Xinput support + if [ "$CFG_XINPUT" != "no" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xinput "XInput" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + if [ "$CFG_XINPUT" != "runtime" ]; then + CFG_XINPUT=yes + fi else - if [ "$CFG_TABLET" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "Tablet support cannot be enabled due to functionality tests!" + if [ "$CFG_XINPUT" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then + echo "Tablet and Xinput support cannot be enabled due to functionality tests!" echo " Turn on verbose messaging (-v) to $0 to see the final report." echo " If you believe this message is in error you may use the continue" echo " switch (-continue) to $0 to continue." exit 101 else - CFG_TABLET=no + CFG_XINPUT=no fi fi fi @@ -4613,77 +5042,32 @@ if [ "$PLATFORM_X11" = "yes" ]; then fi fi fi -fi # X11 - -if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then - # auto-detect Glib support - if [ "$CFG_GLIB" != "no" ]; then + if [ "$CFG_GLIB" = "yes" -a "$CFG_QGTKSTYLE" != "no" ]; then if [ -n "$PKG_CONFIG" ]; then - QT_CFLAGS_GLIB=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0 2>/dev/null` - QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null` + QT_CFLAGS_QGTKSTYLE=`$PKG_CONFIG --cflags gtk+-2.0 ">=" 2.10 atk 2>/dev/null` + QT_LIBS_QGTKSTYLE=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null` fi - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/glib "Glib" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_GLIB $QT_LIBS_GLIB $X11TESTS_FLAGS; then - CFG_GLIB=yes - QMakeVar set QT_CFLAGS_GLIB "$QT_CFLAGS_GLIB" - QMakeVar set QT_LIBS_GLIB "$QT_LIBS_GLIB" + if [ -n "$QT_CFLAGS_QGTKSTYLE" ] ; then + CFG_QGTKSTYLE=yes + QMakeVar set QT_CFLAGS_QGTKSTYLE "$QT_CFLAGS_QGTKSTYLE" + QMakeVar set QT_LIBS_QGTKSTYLE "$QT_LIBS_QGTKSTYLE" else - if [ "$CFG_GLIB" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "Glib support cannot be enabled due to functionality tests!" + if [ "$CFG_QGTKSTYLE" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then + echo "Gtk theme support cannot be enabled due to functionality tests!" echo " Turn on verbose messaging (-v) to $0 to see the final report." echo " If you believe this message is in error you may use the continue" echo " switch (-continue) to $0 to continue." exit 101 else - CFG_GLIB=no + CFG_QGTKSTYLE=no fi fi + elif [ "$CFG_GLIB" = "no" ]; then + CFG_QGTKSTYLE=no fi +fi # X11 - if [ "$CFG_PHONON" != "no" ]; then - if [ "$CFG_PHONON_BACKEND" != "no" ]; then - if [ "$CFG_GLIB" = "yes" -a "$CFG_GSTREAMER" != "no" ]; then - if [ -n "$PKG_CONFIG" ]; then - QT_CFLAGS_GSTREAMER=`$PKG_CONFIG --cflags gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null` - QT_LIBS_GSTREAMER=`$PKG_CONFIG --libs gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null` - fi - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/gstreamer "GStreamer" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_GSTREAMER $QT_LIBS_GSTREAMER $X11TESTS_FLAGS; then - CFG_GSTREAMER=yes - QMakeVar set QT_CFLAGS_GSTREAMER "$QT_CFLAGS_GSTREAMER" - QMakeVar set QT_LIBS_GSTREAMER "$QT_LIBS_GSTREAMER" - else - if [ "$CFG_GSTREAMER" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "Gstreamer support cannot be enabled due to functionality tests!" - echo " Turn on verbose messaging (-v) to $0 to see the final report." - echo " If you believe this message is in error you may use the continue" - echo " switch (-continue) to $0 to continue." - exit 101 - else - CFG_GSTREAMER=no - fi - fi - elif [ "$CFG_GLIB" = "no" ]; then - CFG_GSTREAMER=no - fi - - if [ "$CFG_GSTREAMER" = "yes" ]; then - CFG_PHONON=yes - else - if [ "$CFG_PHONON" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "Phonon support cannot be enabled due to functionality tests!" - echo " Turn on verbose messaging (-v) to $0 to see the final report." - echo " If you believe this message is in error you may use the continue" - echo " switch (-continue) to $0 to continue." - exit 101 - else - CFG_PHONON=no - fi - fi - else - CFG_PHONON=yes - fi - fi -fi # X11/QWS if [ "$PLATFORM_MAC" = "yes" ]; then if [ "$CFG_PHONON" != "no" ]; then @@ -4695,16 +5079,43 @@ fi # QWS if [ "$PLATFORM_QWS" = "yes" ]; then - # OpenGL ES + # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x) if [ "$CFG_OPENGL" = "yes" ]; then - if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/opengles "OpenGL ES" $L_FLAGS $I_FLAGS $l_FLAGS; then - echo "The OpenGL ES functionality test failed!" + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS; then + CFG_OPENGL=es2 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then + CFG_OPENGL=es1 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1cl "OpenGL ES 1.x Lite" $L_FLAGS $I_FLAGS $l_FLAGS; then + CFG_OPENGL=es1cl + else + echo "All the OpenGL ES functionality tests failed!" + echo " You might need to modify the include and library search paths by editing" + echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in" + echo " ${XQMAKESPEC}." + exit 1 + fi + elif [ "$CFG_OPENGL" = "es1" ]; then + # OpenGL ES 1.x + if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then + echo "The OpenGL ES 1.x functionality test failed!" echo " You might need to modify the include and library search paths by editing" echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in" echo " ${XQMAKESPEC}." exit 1 fi - + elif [ "$CFG_OPENGL" = "es2" ]; then + #OpenGL ES 2.x + if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS; then + echo "The OpenGL ES 2.0 functionality test failed!" + echo " You might need to modify the include and library search paths by editing" + echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in" + echo " ${XQMAKESPEC}." + exit 1 + fi + elif [ "$CFG_OPENGL" = "desktop" ]; then + # Desktop OpenGL support + echo "Desktop OpenGL support is not avaliable on Qt for Embedded Linux" + exit 1 fi # screen drivers @@ -4730,14 +5141,34 @@ if [ "$PLATFORM_QWS" = "yes" ]; then fi if [ "${screen}" = "directfb" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; then - if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/directfb "DirectFB" $L_FLAGS $I_FLAGS $l_FLAGS; then + if [ -n "$PKG_CONFIG" ]; then + if $PKG_CONFIG --exists directfb 2>/dev/null; then + QT_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null` + QT_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null` + elif directfb-config --version >/dev/null 2>&1; then + QT_CFLAGS_DIRECTFB=`directfb-config --cflags 2>/dev/null` + QT_LIBS_DIRECTFB=`directfb-config --libs 2>/dev/null` + fi + fi + + # QMake variables set here override those in the mkspec. Therefore we only set the variables here if they are not zero. + if [ -n "$QT_CFLAGS_DIRECTFB" ] || [ -n "$QT_LIBS_DIRECTFB" ]; then + QMakeVar set QT_CFLAGS_DIRECTFB "$QT_CFLAGS_DIRECTFB" + QMakeVar set QT_LIBS_DIRECTFB "$QT_LIBS_DIRECTFB" + fi + if [ "$CFG_QT3SUPPORT" = "yes" ]; then + QMakeVar set QT_DEFINES_DIRECTFB "QT3_SUPPORT" + fi + + if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/directfb "DirectFB" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_DIRECTFB $QT_LIBS_DIRECTFB; then echo "The DirectFB screen driver functionality test failed!" echo " You might need to modify the include and library search paths by editing" - echo " QMAKE_INCDIR and QMAKE_LIBDIR in" + echo " QT_CFLAGS_DIRECTFB and QT_LIBS_DIRECTFB in" echo " ${XQMAKESPEC}." exit 1 fi fi + done # mouse drivers @@ -4753,6 +5184,8 @@ if [ "$PLATFORM_QWS" = "yes" ]; then fi done + CFG_QGTKSTYLE=no + # sound if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/sound "sound" $L_FLAGS $I_FLAGS $l_FLAGS; then QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SOUND" @@ -4764,7 +5197,7 @@ fi # QWS [ "x$CFG_EMBEDDED" != "xno" ] && CFG_LIBFREETYPE="$CFG_QWS_FREETYPE" [ "x$PLATFORM_MAC" = "xyes" ] && CFG_LIBFREETYPE=no if [ "$CFG_LIBFREETYPE" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/freetype "FreeType" $L_FLAGS $I_FLAGS $l_FLAGS ; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/freetype "FreeType" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then CFG_LIBFREETYPE=system else CFG_LIBFREETYPE=yes @@ -4881,7 +5314,7 @@ fi # find if the platform supports IPv6 if [ "$CFG_IPV6" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then CFG_IPV6=yes else if [ "$CFG_IPV6" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -5012,7 +5445,7 @@ fi # detect OpenSSL if [ "$CFG_OPENSSL" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then if [ "$CFG_OPENSSL" = "auto" ]; then CFG_OPENSSL=yes fi @@ -5029,6 +5462,15 @@ if [ "$CFG_OPENSSL" != "no" ]; then fi fi +if [ "$CFG_PTMALLOC" != "no" ]; then + # build ptmalloc, copy .a file to lib/ + echo "Building ptmalloc. Please wait..." + (cd "$relpath/src/3rdparty/ptmalloc/"; "$MAKE" "clean" ; "$MAKE" "posix" + mkdir "$outpath/lib/" ; cp "libptmalloc3.a" "$outpath/lib/") + + QMakeVar add QMAKE_LFLAGS "$outpath/lib/libptmalloc3.a" +fi + #------------------------------------------------------------------------------- # ask for all that hasn't been auto-detected or specified in the arguments #------------------------------------------------------------------------------- @@ -5072,6 +5514,61 @@ if [ "$CFG_MAC_DWARF2" = "yes" ]; then QT_CONFIG="$QT_CONFIG dwarf2" fi +# Set the default arch. Select 32-bit/carbon if nothing else has +# been specified on the configure line. +if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_ARCHS" == "" ]; then + source "$mactests/defaultarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" + + if [ "$QT_MAC_DEFUALT_ARCH" == "x86_64" ]; then + CFG_MAC_ARCHS=" x86" + elif [ "$QT_MAC_DEFUALT_ARCH" == "ppc64" ]; then + CFG_MAC_ARCHS=" ppc" + else + CFG_MAC_ARCHS=" $QT_MAC_DEFUALT_ARCH" + fi + + [ "$OPT_VERBOSE" == "yes" ] && echo "Setting Mac architechture to$CFG_MAC_ARCHS." +fi + +# enable cocoa and/or carbon on Mac +if [ "$CFG_MAC_COCOA" = "yes" ]; then +# -cocoa on the command line disables carbon completely (i.e. use cocoa for 32-bit as well) + CFG_MAC_CARBON="no" +else +# check which archs are in use, enable cocoa if we find a 64-bit one + if echo "$CFG_MAC_ARCHS" | grep 64 > /dev/null 2>&1; then + CFG_MAC_COCOA="yes"; + CFG_MAC_CARBON="no"; + if echo "$CFG_MAC_ARCHS" | grep -w ppc > /dev/null 2>&1; then + CFG_MAC_CARBON="yes"; + fi + if echo "$CFG_MAC_ARCHS" | grep -w x86 > /dev/null 2>&1; then + CFG_MAC_CARBON="yes"; + fi + else +# no 64-bit archs found. + CFG_MAC_COCOA="no" + fi +fi; + +# set the global Mac deployment target. This is overridden on an arch-by-arch basis +# in some cases, see code further down +case "$PLATFORM,$CFG_MAC_COCOA" in + macx*,yes) + # Cocoa + QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.5 + CFG_QT3SUPPORT="no" + ;; + macx-icc,*) + # Intel CC, Carbon + QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.4 + ;; + macx*,no) + # gcc, Carbon + QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.3 + ;; +esac + # enable Qt 3 support functionality if [ "$CFG_QT3SUPPORT" = "yes" ]; then QT_CONFIG="$QT_CONFIG qt3support" @@ -5098,14 +5595,30 @@ fi if [ "$CFG_OPENGL" = "no" ]; then QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENGL" else + QT_CONFIG="$QT_CONFIG opengl" +fi + +if [ "$CFG_OPENGL" = "es1" ] || [ "$CFG_OPENGL" = "es1cl" ] || [ "$CFG_OPENGL" = "es2" ]; then if [ "$PLATFORM_QWS" = "yes" ]; then QCONFIG_FLAGS="$QCONFIG_FLAGS Q_BACKINGSTORE_SUBSURFACES" QCONFIG_FLAGS="$QCONFIG_FLAGS Q_USE_EGLWINDOWSURFACE" - - # The examples and demos currently don't compile with OpenGL ES - CFG_NOBUILD_PARTS="$CFG_NOBUILD_PARTS examples demos" fi - QT_CONFIG="$QT_CONFIG opengl" + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES" +fi + +if [ "$CFG_OPENGL" = "es1" ]; then + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES_1" + QT_CONFIG="$QT_CONFIG opengles1" +fi + +if [ "$CFG_OPENGL" = "es1cl" ]; then + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES_1_CL" + QT_CONFIG="$QT_CONFIG opengles1cl" +fi + +if [ "$CFG_OPENGL" = "es2" ]; then + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES_2" + QT_CONFIG="$QT_CONFIG opengles2" fi # safe execution environment @@ -5113,23 +5626,6 @@ if [ "$CFG_SXE" != "no" ]; then QT_CONFIG="$QT_CONFIG sxe" fi -# update QT_CONFIG to show our current predefined configuration -case "$CFG_QCONFIG" in -minimal|small|medium|large|full) - # these are a sequence of increasing functionality - for c in minimal small medium large full; do - QT_CONFIG="$QT_CONFIG $c-config" - [ "$CFG_QCONFIG" = $c ] && break - done - ;; -*) - # not known to be sufficient for anything - if [ '!' -f "$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h" ]; then - echo >&2 "No such configuration: $CFG_QCONFIG" - OPT_HELP=yes - fi -esac - # build up the variables for output if [ "$CFG_DEBUG" = "yes" ]; then QMAKE_OUTDIR="${QMAKE_OUTDIR}debug" @@ -5309,21 +5805,21 @@ if [ "$PLATFORM_X11" = "yes" ]; then QT_CONFIG="$QT_CONFIG xrender" QMakeVar set QMAKE_LIBS_X11 '-lXrender $$QMAKE_LIBS_X11' fi + if [ "$CFG_MITSHM" = "yes" ]; then + QT_CONFIG="$QT_CONFIG mitshm" + fi if [ "$CFG_FONTCONFIG" = "yes" ]; then QT_CONFIG="$QT_CONFIG fontconfig" fi - if [ "$CFG_TABLET" = "yes" ]; then - QT_CONFIG="$QT_CONFIG tablet" + if [ "$CFG_XINPUT" = "yes" ]; then QMakeVar set QMAKE_LIBS_X11 '-lXi $$QMAKE_LIBS_X11' fi + if [ "$CFG_XINPUT" = "yes" ]; then + QT_CONFIG="$QT_CONFIG xinput tablet" + fi if [ "$CFG_XKB" = "yes" ]; then QT_CONFIG="$QT_CONFIG xkb" fi - -elif [ "$PLATFORM_MAC" = "yes" ]; then - if [ "$CFG_TABLET" = "yes" ]; then - QT_CONFIG="$QT_CONFIG tablet" - fi fi [ '!' -z "$D_FLAGS" ] && QMakeVar add DEFINES "$D_FLAGS" @@ -5383,15 +5879,34 @@ fi # See Qt documentation for more information on which features are # supported and on which compilers. # -canBuildPatternist="yes" +canBuildQtXmlPatterns="yes" canBuildWebKit="$HAVE_STL" # WebKit requires stdint.h -if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stdint "Stdint" $L_FLAGS $I_FLAGS $l_FLAGS; then +"$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stdint "Stdint" $L_FLAGS $I_FLAGS $l_FLAGS +if [ $? != "0" ]; then canBuildWebKit="no" fi case "$XPLATFORM" in + hpux-g++*) + # PA-RISC's assembly is too limited + # gcc 3.4 on that platform can't build QtXmlPatterns + # the assembly it generates cannot be compiled + + # Check gcc's version + case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in + 4*) + ;; + 3.4*) + canBuildQtXmlPatterns="no" + ;; + *) + canBuildWebKit="no" + canBuildQtXmlPatterns="no" + ;; + esac + ;; *-g++*) # Check gcc's version case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in @@ -5402,32 +5917,29 @@ case "$XPLATFORM" in ;; *) canBuildWebKit="no" - canBuildPatternist="no" + canBuildQtXmlPatterns="no" ;; esac ;; solaris-cc*) # Check the compiler version case `${QMAKE_CONF_COMPILER} -V 2>&1 | awk '{print $4}'` in - 5.[0123456]) - canBuildWebKit="no" - canBuildPatternist="no" - ;; - 5.[78]) + *) canBuildWebKit="no" + canBuildQtXmlPatterns="no" ;; esac ;; hpux-acc*) canBuildWebKit="no" - canBuildPatternist="no" + canBuildQtXmlPatterns="no" ;; hpuxi-acc*) canBuildWebKit="no" ;; aix-xlc*) canBuildWebKit="no" - canBuildPatternist="no" + canBuildQtXmlPatterns="no" ;; irix-cc*) canBuildWebKit="no" @@ -5439,7 +5951,7 @@ if [ "$CFG_XMLPATTERNS" = "yes" -a "$CFG_EXCEPTIONS" = "no" ]; then exit 1 fi if [ "$CFG_XMLPATTERNS" = "auto" -a "$CFG_EXCEPTIONS" != "no" ]; then - CFG_XMLPATTERNS="$canBuildPatternist" + CFG_XMLPATTERNS="$canBuildQtXmlPatterns" elif [ "$CFG_EXCEPTIONS" = "no" ]; then CFG_XMLPATTERNS="no" fi @@ -5468,8 +5980,15 @@ else QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_WEBKIT" fi -if [ "$CFG_ASSISTANT_WEBKIT" = "yes" ]; then - QT_CONFIG="$QT_CONFIG assistant_webkit" +if [ "$CFG_SCRIPTTOOLS" = "auto" ]; then + CFG_SCRIPTTOOLS="yes" +fi + +if [ "$CFG_SCRIPTTOOLS" = "yes" ]; then + QT_CONFIG="$QT_CONFIG scripttools" + CFG_SCRIPTTOOLS="yes" +else + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPTTOOLS" fi if [ "$CFG_EXCEPTIONS" = "no" ]; then @@ -5494,6 +6013,38 @@ if [ "$CFG_EXCEPTIONS" = "no" ]; then QMAKE_CONFIG="$QMAKE_CONFIG exceptions_off" fi +# On Mac, set the minimum deployment target for the different architechtures +# using the Xarch compiler option when supported (10.5 and up). On 10.4 the +# deployment version is set to 10.3 globally using the QMAKE_MACOSX_DEPLOYMENT_TARGET +# env. variable. "-cocoa" on the command line means Cocoa is used in 32-bit mode also, +# in this case fall back on QMAKE_MACOSX_DEPLOYMENT_TARGET which will be set to 10.5. +if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] && [ "$COMMANDLINE_MAC_COCOA" != "yes" ]; then + if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then + QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=10.4" + QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=10.4" + QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=10.4" + QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=10.4" + fi + if echo "$CFG_MAC_ARCHS" | grep '\<ppc\>' > /dev/null 2>&1; then + QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=10.3" + QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=10.3" + QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=10.3" + QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=10.3" + fi + if echo "$CFG_MAC_ARCHS" | grep '\<x86_64\>' > /dev/null 2>&1; then + QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5" + QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5" + QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5" + QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5" + fi + if echo "$CFG_MAC_ARCHS" | grep '\<ppc64\>' > /dev/null 2>&1; then + QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5" + QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5" + QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5" + QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5" + fi +fi + #------------------------------------------------------------------------------- # generate QT_BUILD_KEY #------------------------------------------------------------------------------- @@ -5504,6 +6055,20 @@ case "$COMPILER" in g++*) # GNU C++ COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -dumpversion 2>/dev/null` + + case "$COMPILER_VERSION" in + *.*.*) + QT_GCC_MAJOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\1,'` + QT_GCC_MINOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\2,'` + QT_GCC_PATCH_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\3,'` + ;; + *.*) + QT_GCC_MAJOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\).*,\1,'` + QT_GCC_MINOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\).*,\2,'` + QT_GCC_PATCH_VERSION=0 + ;; + esac + case "$COMPILER_VERSION" in 2.95.*) COMPILER_VERSION="2.95.*" @@ -5556,7 +6121,7 @@ esac # tablet # ipv6 # -# X11 : x11sm xinerama xcursor xfixes xrandr xrender fontconfig xkb +# X11 : x11sm xinerama xcursor xfixes xrandr xrender mitshm fontconfig xkb # Embedded: embedded freetype # ALL_OPTIONS="stl" @@ -5634,16 +6199,37 @@ fi rm -f .options BUILD_OPTIONS="$BUILD_CONFIG $BUILD_OPTIONS" -if [ "$QT_CROSS_COMPILE" = "yes" ]; then - # extract the operating system from the XPLATFORM - TARGET_OPERATING_SYSTEM=`echo $XPLATFORM | cut -f 2- -d/ | cut -f -1 -d-` - # when cross-compiling, don't include build-host information (build key is target specific) - QT_BUILD_KEY="$CFG_USER_BUILD_KEY $CFG_ARCH $TARGET_OPERATING_SYSTEM $COMPILER $BUILD_OPTIONS" -else - QT_BUILD_KEY="$CFG_USER_BUILD_KEY $UNAME_MACHINE $UNAME_SYSTEM $COMPILER $BUILD_OPTIONS" +# extract the operating system from the XPLATFORM +TARGET_OPERATING_SYSTEM=`echo $XPLATFORM | cut -f 2- -d/ | cut -f -1 -d-` + +# when cross-compiling, don't include build-host information (build key is target specific) +QT_BUILD_KEY="$CFG_USER_BUILD_KEY $CFG_ARCH $TARGET_OPERATING_SYSTEM $COMPILER $BUILD_OPTIONS" +if [ -n "$QT_NAMESPACE" ]; then + QT_BUILD_KEY="$QT_BUILD_KEY $QT_NAMESPACE" +fi +MAC_NEED_TWO_BUILD_KEYS="no" +if [ "$PLATFORM_MAC" = "yes" -a "$CFG_MAC_COCOA" = "yes" ]; then + QT_BUILD_KEY_CARBON=$QT_BUILD_KEY + TARGET_OPERATING_SYSTEM="$TARGET_OPERATING_SYSTEM-cocoa" + QT_BUILD_KEY_COCOA="$CFG_USER_BUILD_KEY $CFG_ARCH $TARGET_OPERATING_SYSTEM $COMPILER $BUILD_OPTIONS" + if [ "$CFG_MAC_CARBON" = "no" ]; then + QT_BUILD_KEY=$QT_BUILD_KEY_COCOA + else + MAC_NEED_TWO_BUILD_KEYS="yes" + fi +fi +# don't break loading plugins build with an older version of Qt +QT_BUILD_KEY_COMPAT= +if [ "$QT_CROSS_COMPILE" = "no" ]; then + # previous versions of Qt used a build key built from the uname + QT_BUILD_KEY_COMPAT="$CFG_USER_BUILD_KEY $UNAME_MACHINE $UNAME_SYSTEM $COMPILER $BUILD_OPTIONS" + if [ -n "$QT_NAMESPACE" ]; then + QT_BUILD_KEY_COMPAT="$QT_BUILD_KEY_COMPAT $QT_NAMESPACE" + fi fi # strip out leading/trailing/extra whitespace QT_BUILD_KEY=`echo $QT_BUILD_KEY | sed -e "s, *, ,g" -e "s,^ *,," -e "s, *$,,"` +QT_BUILD_KEY_COMPAT=`echo $QT_BUILD_KEY_COMPAT | sed -e "s, *, ,g" -e "s,^ *,," -e "s, *$,,"` #------------------------------------------------------------------------------- # part of configuration information goes into qconfig.h @@ -5660,6 +6246,7 @@ full) echo "#endif" >>"$tmpconfig" ;; esac + cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF /* Qt Edition */ @@ -5667,13 +6254,27 @@ cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF # define QT_EDITION $QT_EDITION #endif -#define QT_BUILD_KEY "$QT_BUILD_KEY" - /* Machine byte-order */ #define Q_BIG_ENDIAN 4321 #define Q_LITTLE_ENDIAN 1234 +EOF + +if [ "$MAC_NEED_TWO_BUILD_KEYS" = "no" ]; then + echo "#define QT_BUILD_KEY \"$QT_BUILD_KEY\"" \ + >> "$outpath/src/corelib/global/qconfig.h.new" +else + cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF +#define QT_BUILD_KEY_CARBON "$QT_BUILD_KEY_CARBON" +#define QT_BUILD_KEY_COCOA "$QT_BUILD_KEY_COCOA" EOF +fi + +if [ -n "$QT_BUILD_KEY_COMPAT" ]; then + echo "#define QT_BUILD_KEY_COMPAT \"$QT_BUILD_KEY_COMPAT\"" \ + >> "$outpath/src/corelib/global/qconfig.h.new" +fi +echo "" >>"$outpath/src/corelib/global/qconfig.h.new" echo "#ifdef QT_BOOTSTRAPPED" >>"$outpath/src/corelib/global/qconfig.h.new" if [ "$CFG_HOST_ENDIAN" = "auto" ]; then @@ -5745,6 +6346,13 @@ if [ "$CFG_LARGEFILE" = "yes" ]; then echo "#define QT_LARGEFILE_SUPPORT 64" >>"$outpath/src/corelib/global/qconfig.h.new" fi +# if both carbon and cocoa are specified, enable the autodetection code. +if [ "$CFG_MAC_COCOA" = "yes" -a "$CFG_MAC_CARBON" = "yes" ]; then + echo "#define AUTODETECT_COCOA 1" >>"$outpath/src/corelib/global/qconfig.h.new" +elif [ "$CFG_MAC_COCOA" = "yes" ]; then + echo "#define QT_MAC_USE_COCOA 1" >>"$outpath/src/corelib/global/qconfig.h.new" +fi + if [ "$CFG_FRAMEWORK" = "yes" ]; then echo "#define QT_MAC_FRAMEWORK_BUILD" >>"$outpath/src/corelib/global/qconfig.h.new" fi @@ -5765,7 +6373,7 @@ fi echo "" >>"$outpath/src/corelib/global/qconfig.h.new" -if [ "$Edition" = "Trolltech" ]; then +if [ "$CFG_DEV" = "yes" ]; then echo "#define QT_BUILD_INTERNAL" >>"$outpath/src/corelib/global/qconfig.h.new" fi @@ -5789,7 +6397,7 @@ if [ "$PLATFORM_QWS" = "yes" ]; then CFG_KBD_OFF="$CFG_KBD_AVAILABLE" # the um driver is currently not in the available list for external builds - if [ "$Edition" != "Trolltech" ]; then + if [ "$CFG_DEV" = "no" ]; then CFG_KBD_OFF="$CFG_KBD_OFF um" fi for ADRIVER in $CFG_KBD_ON; do @@ -5836,6 +6444,7 @@ for DRIVER in $CFG_SQL_AVAILABLE; do esac done + QMakeVar set sql-drivers "$SQL_DRIVERS" QMakeVar set sql-plugins "$SQL_PLUGINS" @@ -5847,16 +6456,21 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" [ "$CFG_MNG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_MNG" [ "$CFG_ZLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ZLIB" [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS" -[ "$CFG_TABLET" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_TABLET" [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6" [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" [ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" +if [ "$PLATFORM_QWS" != "yes" ]; then + [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" + [ "$CFG_GRAPHICS_SYSTEM" = "opengl" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_OPENGL" +fi + # X11/Unix/Mac only configs [ "$CFG_CUPS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS" [ "$CFG_ICONV" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ICONV" [ "$CFG_GLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GLIB" [ "$CFG_GSTREAMER" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GSTREAMER" +[ "$CFG_QGTKSTYLE" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_GTK" [ "$CFG_CLOCK_MONOTONIC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CLOCK_MONOTONIC" [ "$CFG_MREMAP" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MREMAP" [ "$CFG_GETADDRINFO" = "no" ]&& QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GETADDRINFO" @@ -5876,11 +6490,15 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" [ "$CFG_XKB" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XKB" [ "$CFG_XRANDR" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XRANDR" [ "$CFG_XRENDER" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XRENDER" +[ "$CFG_MITSHM" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MITSHM" [ "$CFG_XSHAPE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SHAPE" +[ "$CFG_XINPUT" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XINPUT QT_NO_TABLET" [ "$CFG_XCURSOR" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XCURSOR" [ "$CFG_XINERAMA" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XINERAMA" [ "$CFG_XFIXES" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XFIXES" +[ "$CFG_XRANDR" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XRANDR" +[ "$CFG_XINPUT" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XINPUT" # sort QCONFIG_FLAGS for neatness if we can [ '!' -z "$AWK" ] && QCONFIG_FLAGS=`echo $QCONFIG_FLAGS | $AWK '{ gsub(" ", "\n"); print }' | sort | uniq` @@ -5974,6 +6592,13 @@ fi if [ "$PLATFORM_MAC" = "yes" ]; then QT_CONFIG="$QT_CONFIG $CFG_MAC_ARCHS" fi + +# Make the application arch follow the Qt arch for single arch builds. +# (for multiple-arch builds, set CONFIG manually in the application .pro file) +if [ `echo "$CFG_MAC_ARCHS" | wc -w` -eq 1 ]; then + QTCONFIG_CONFIG="$QTCONFIG_CONFIG $CFG_MAC_ARCHS" +fi + cat >>"$QTCONFIG.tmp" <<EOF #configuration CONFIG += $QTCONFIG_CONFIG @@ -5990,11 +6615,17 @@ QT_PATCH_VERSION = $QT_PATCH_VERSION #namespaces QT_LIBINFIX = $QT_LIBINFIX QT_NAMESPACE = $QT_NAMESPACE +QT_NAMESPACE_MAC_CRC = $QT_NAMESPACE_MAC_CRC EOF if [ "$CFG_RPATH" = "yes" ]; then echo "QMAKE_RPATHDIR += \"$QT_INSTALL_LIBS\"" >> "$QTCONFIG.tmp" fi +if [ -n "$QT_GCC_MAJOR_VERSION" ]; then + echo "QT_GCC_MAJOR_VERSION = $QT_GCC_MAJOR_VERSION" >> "$QTCONFIG.tmp" + echo "QT_GCC_MINOR_VERSION = $QT_GCC_MINOR_VERSION" >> "$QTCONFIG.tmp" + echo "QT_GCC_PATCH_VERSION = $QT_GCC_PATCH_VERSION" >> "$QTCONFIG.tmp" +fi # replace qconfig.pri if it differs from the newly created temp file if cmp -s "$QTCONFIG.tmp" "$QTCONFIG"; then rm -f "$QTCONFIG.tmp" @@ -6062,6 +6693,11 @@ if [ '!' -z "$CFG_SDK" ]; then echo "QMAKE_MAC_SDK = $CFG_SDK" >> "$CACHEFILE.tmp" fi +# mac gcc -Xarch support +if [ "$CFG_MAC_XARCH" = "no" ]; then + echo "QMAKE_MAC_XARCH = no" >> "$CACHEFILE.tmp" +fi + #dump the qmake spec if [ -d "$outpath/mkspecs/$XPLATFORM" ]; then echo "QMAKESPEC = \$\$QT_BUILD_TREE/mkspecs/$XPLATFORM" >> "$CACHEFILE.tmp" @@ -6075,7 +6711,7 @@ rm -f "$QMAKE_VARS_FILE" 2>/dev/null # incrementals INCREMENTAL="" -[ "$CFG_INCREMENTAL" = "auto" ] && "$WHICH" p4 >/dev/null 2>&1 && [ "$Edition" = "Trolltech" ] && CFG_INCREMENTAL="yes" +[ "$CFG_INCREMENTAL" = "auto" ] && "$WHICH" p4 >/dev/null 2>&1 && [ "$CFG_DEV" = "yes" ] && CFG_INCREMENTAL="yes" if [ "$CFG_INCREMENTAL" = "yes" ]; then find "$relpath" -perm u+w -mtime -3 | grep 'cpp$' | while read f; do # don't need to worry about generated files @@ -6139,6 +6775,15 @@ EOF *) ;; esac +if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" == "no" ] && [ "$CFG_WEBKIT" = "yes" ] && [ "$CFG_DEBUG_RELEASE" == "yes" ]; then + cat <<EOF + WARNING: DWARF2 debug symbols are not enabled. Linking webkit + in debug mode will run out of memory on systems with 2GB or less. + Install Xcode 2.4.1 or higher to enable DWARF2, or configure with + -no-webkit or -release to skip webkit debug. +EOF +fi + echo if [ "$XPLATFORM" = "$PLATFORM" ]; then echo "Build type: $PLATFORM" @@ -6146,11 +6791,29 @@ else echo "Building on: $PLATFORM" echo "Building for: $XPLATFORM" fi -echo "Architecture: $CFG_ARCH" + +if [ "$PLATFORM_MAC" = "yes" ]; then + echo "Architecture: $CFG_ARCH ($CFG_MAC_ARCHS )" +else + echo "Architecture: $CFG_ARCH" +fi + if [ "$PLATFORM_QWS" = "yes" ]; then echo "Host architecture: $CFG_HOST_ARCH" fi +if [ "$PLATFORM_MAC" = "yes" ]; then + if [ "$CFG_MAC_COCOA" = "yes" ]; then + if [ "$CFG_MAC_CARBON" = "yes" ]; then + echo "Using framework: Carbon for 32-bit, Cocoa for 64-bit" + else + echo "Using framework: Cocoa" + fi + else + echo "Using framework: Carbon" + fi +fi + if [ -n "$PLATFORM_NOTES" ]; then echo "Platform notes:" echo "$PLATFORM_NOTES" @@ -6185,17 +6848,18 @@ echo "Qt 3 compatibility .. $CFG_QT3SUPPORT" [ "$CFG_DBUS" = "no" ] && echo "QtDBus module ....... no" [ "$CFG_DBUS" = "yes" ] && echo "QtDBus module ....... yes (run-time)" [ "$CFG_DBUS" = "linked" ] && echo "QtDBus module ....... yes (linked)" +echo "QtScriptTools module $CFG_SCRIPTTOOLS" echo "QtXmlPatterns module $CFG_XMLPATTERNS" echo "Phonon module ....... $CFG_PHONON" echo "SVG module .......... $CFG_SVG" echo "WebKit module ....... $CFG_WEBKIT" -echo "WebKit in Assistant $CFG_ASSISTANT_WEBKIT" echo "STL support ......... $CFG_STL" echo "PCH support ......... $CFG_PRECOMPILE" echo "MMX/3DNOW/SSE/SSE2.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}" if [ "${CFG_ARCH}" = "arm" ]; then echo "iWMMXt support ...... ${CFG_IWMMXT}" fi +[ "${PLATFORM_QWS}" != "yes" ] && echo "Graphics System ..... $CFG_GRAPHICS_SYSTEM" echo "IPv6 support ........ $CFG_IPV6" echo "IPv6 ifname support . $CFG_IPV6IFNAME" echo "getaddrinfo support . $CFG_GETADDRINFO" @@ -6229,6 +6893,7 @@ else echo "MNG support ......... $CFG_MNG ($CFG_LIBMNG)" fi echo "zlib support ........ $CFG_ZLIB" +echo "Session management .. $CFG_SM" if [ "$PLATFORM_QWS" = "yes" ]; then echo "Embedded support .... $CFG_EMBEDDED" if [ "$CFG_QWS_FREETYPE" = "auto" ]; then @@ -6254,19 +6919,31 @@ if [ "$PLATFORM_QWS" = "yes" ]; then echo "Mouse driver (qt) ... $CFG_MOUSE_ON" echo "Mouse driver (plugin) $CFG_MOUSE_PLUGIN" fi - echo "OpenGL support ...... $CFG_OPENGL" +if [ "$CFG_OPENGL" = "desktop" ]; then + echo "OpenGL support ...... yes (Desktop OpenGL)" +elif [ "$CFG_OPENGL" = "es1" ]; then + echo "OpenGL support ...... yes (OpenGL ES 1.x Common profile)" +elif [ "$CFG_OPENGL" = "es1cl" ]; then + echo "OpenGL support ...... yes (OpenGL ES 1.x Common Lite profile)" +elif [ "$CFG_OPENGL" = "es2" ]; then + echo "OpenGL support ...... yes (OpenGL ES 2.x)" +else + echo "OpenGL support ...... no" +fi if [ "$PLATFORM_X11" = "yes" ]; then echo "NAS sound support ... $CFG_NAS" - echo "Session management .. $CFG_SM" echo "XShape support ...... $CFG_XSHAPE" echo "Xinerama support .... $CFG_XINERAMA" echo "Xcursor support ..... $CFG_XCURSOR" echo "Xfixes support ...... $CFG_XFIXES" echo "Xrandr support ...... $CFG_XRANDR" echo "Xrender support ..... $CFG_XRENDER" + echo "Xi support .......... $CFG_XINPUT" + echo "MIT-SHM support ..... $CFG_MITSHM" echo "FontConfig support .. $CFG_FONTCONFIG" echo "XKB Support ......... $CFG_XKB" echo "immodule support .... $CFG_IM" + echo "GTK theme support ... $CFG_QGTKSTYLE" fi [ "$CFG_SQL_mysql" != "no" ] && echo "MySQL support ....... $CFG_SQL_mysql" [ "$CFG_SQL_psql" != "no" ] && echo "PostgreSQL support .. $CFG_SQL_psql" @@ -6286,6 +6963,8 @@ elif [ "$CFG_OPENSSL" = "linked" ]; then fi echo "OpenSSL support ..... $CFG_OPENSSL $OPENSSL_LINKAGE" +[ "$CFG_PTMALLOC" != "no" ] && echo "Use ptmalloc ........ $CFG_PTMALLOC" + # complain about not being able to use dynamic plugins if we are using a static build if [ "$CFG_SHARED" = "no" ]; then echo @@ -6455,7 +7134,7 @@ for part in $CFG_BUILD_PARTS; do esac done -if [ "$Edition" = "Trolltech" ]; then +if [ "$CFG_DEV" = "yes" ]; then PART_ROOTS="$PART_ROOTS tests" fi @@ -6475,7 +7154,7 @@ for file in .projects .projects.3; do case $a in *winmain/winmain.pro) continue ;; */qmake/qmake.pro) continue ;; - *tools/moc*|*tools/rcc*|*tools/uic*) SPEC=$QMAKESPEC ;; + *tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*) SPEC=$QMAKESPEC ;; *) SPEC=$XQMAKESPEC ;; esac dir=`dirname $a | sed -e "s;$sepath;.;g"` diff --git a/devel/qt4/files/extrapatch-configure b/devel/qt4/files/extrapatch-configure index 07f050b0e14c..5d8e9a1806a4 100644 --- a/devel/qt4/files/extrapatch-configure +++ b/devel/qt4/files/extrapatch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2008-04-28 17:11:12.000000000 +0400 -+++ configure 2008-06-15 11:00:20.000000000 +0400 -@@ -1887,12 +1887,6 @@ +--- ./configure.orig 2009-04-22 03:57:35.000000000 +0400 ++++ ./configure 2009-05-21 02:46:31.000000000 +0400 +@@ -2084,12 +2084,6 @@ chmod 755 "$outpath/bin/syncqt" fi @@ -13,7 +13,7 @@ # symlink the doc directory rm -rf "$outpath/doc" ln -s "$relpath/doc" "$outpath/doc" -@@ -1931,7 +1925,7 @@ +@@ -2128,7 +2122,7 @@ # find a make command if [ -z "$MAKE" ]; then MAKE= @@ -22,7 +22,7 @@ if "$WHICH" $mk >/dev/null 2>&1; then MAKE=`$WHICH $mk` break -@@ -3791,7 +3785,7 @@ +@@ -4006,7 +4000,7 @@ } # build qmake @@ -31,7 +31,116 @@ echo "Creating qmake. Please wait..." OLD_QCONFIG_H= -@@ -6309,7 +6303,7 @@ +@@ -4734,12 +4728,13 @@ + fi + + # Check we actually have X11 :-) +- if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then +- echo "Basic XLib functionality test failed!" +- echo " You might need to modify the include and library search paths by editing" +- echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}." +- exit 1 +- fi ++# Requires X11 environment, disable test ++# if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then ++# echo "Basic XLib functionality test failed!" ++# echo " You might need to modify the include and library search paths by editing" ++# echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}." ++# exit 1 ++# fi + + # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x) + if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then +@@ -5569,7 +5564,7 @@ + QT_CONFIG="$QT_CONFIG phonon-backend" + fi + else +- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_PHONON" ++# QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_PHONON" + fi + + # disable accessibility +@@ -5581,7 +5576,7 @@ + + # enable opengl + if [ "$CFG_OPENGL" = "no" ]; then +- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENGL" ++# QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENGL" + else + QT_CONFIG="$QT_CONFIG opengl" + fi +@@ -5946,7 +5941,7 @@ + if [ "$CFG_XMLPATTERNS" = "yes" ]; then + QT_CONFIG="$QT_CONFIG xmlpatterns" + else +- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XMLPATTERNS" ++# QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XMLPATTERNS" + fi + + if [ "$CFG_SVG" = "yes" ]; then +@@ -6442,10 +6437,10 @@ + [ "$CFG_JPEG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_JPEG" + [ "$CFG_MNG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_MNG" + [ "$CFG_ZLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ZLIB" +-[ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS" ++# [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS" + [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6" + [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" +-[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" ++# [ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" + + if [ "$PLATFORM_QWS" != "yes" ]; then + [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" +@@ -6453,33 +6448,33 @@ + fi + + # X11/Unix/Mac only configs +-[ "$CFG_CUPS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS" ++%%CUPS%%[ "$CFG_CUPS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS" + [ "$CFG_ICONV" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ICONV" + [ "$CFG_GLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GLIB" +-[ "$CFG_GSTREAMER" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GSTREAMER" +-[ "$CFG_QGTKSTYLE" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_GTK" ++# [ "$CFG_GSTREAMER" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GSTREAMER" ++%%QGTKSTYLE%%[ "$CFG_QGTKSTYLE" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_GTK" + [ "$CFG_CLOCK_MONOTONIC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CLOCK_MONOTONIC" + [ "$CFG_MREMAP" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MREMAP" + [ "$CFG_GETADDRINFO" = "no" ]&& QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GETADDRINFO" + [ "$CFG_IPV6IFNAME" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6IFNAME" + [ "$CFG_GETIFADDRS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GETIFADDRS" + [ "$CFG_INOTIFY" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_INOTIFY" +-[ "$CFG_NAS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_NAS" ++%%NAS%%[ "$CFG_NAS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_NAS" + [ "$CFG_NIS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_NIS" + [ "$CFG_OPENSSL" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENSSL" + [ "$CFG_OPENSSL" = "linked" ]&& QCONFIG_FLAGS="$QCONFIG_FLAGS QT_LINKED_OPENSSL" + +-[ "$CFG_SM" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SESSIONMANAGER" +-[ "$CFG_XCURSOR" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XCURSOR" +-[ "$CFG_XFIXES" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XFIXES" +-[ "$CFG_FONTCONFIG" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_FONTCONFIG" +-[ "$CFG_XINERAMA" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XINERAMA" +-[ "$CFG_XKB" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XKB" +-[ "$CFG_XRANDR" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XRANDR" +-[ "$CFG_XRENDER" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XRENDER" +-[ "$CFG_MITSHM" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MITSHM" +-[ "$CFG_XSHAPE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SHAPE" +-[ "$CFG_XINPUT" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XINPUT QT_NO_TABLET" ++# [ "$CFG_SM" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SESSIONMANAGER" ++# [ "$CFG_XCURSOR" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XCURSOR" ++# [ "$CFG_XFIXES" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XFIXES" ++# [ "$CFG_FONTCONFIG" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_FONTCONFIG" ++# [ "$CFG_XINERAMA" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XINERAMA" ++# [ "$CFG_XKB" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XKB" ++# [ "$CFG_XRANDR" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XRANDR" ++# [ "$CFG_XRENDER" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XRENDER" ++# [ "$CFG_MITSHM" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MITSHM" ++# [ "$CFG_XSHAPE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SHAPE" ++# [ "$CFG_XINPUT" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XINPUT QT_NO_TABLET" + + [ "$CFG_XCURSOR" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XCURSOR" + [ "$CFG_XINERAMA" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XINERAMA" +@@ -6989,7 +6984,7 @@ if [ -f "${relpath}/projects.pro" ]; then mkfile="${outpath}/Makefile" [ -f "$mkfile" ] && chmod +w "$mkfile" @@ -40,7 +149,7 @@ fi # .projects -> projects to process -@@ -6482,7 +6476,7 @@ +@@ -7162,7 +7157,7 @@ echo " for $a\c" fi |