diff options
161 files changed, 3959 insertions, 8711 deletions
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index 90462c7a4e5d..d00341ea373d 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -1,21 +1,30 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# QT_NONSTANDARD - Suppress modification of configure and make environment. -# QT_DIST - Package being built is part of the Qt distribution. -# # $FreeBSD$ # +# Variables: +# QT_NONSTANDARD - Suppress modification of configure and make environment. +# QT_DIST - Package being built is part of the Qt distribution. +# +# Global switches (add this to /etc/make.conf): +# WITH_KDE_PHONON - If set, standalone phonon will be used instead of Qt. +# Required for KDE 4.4.0 +# QT4_OPTIONS - A list of options, can be CUPS, NAS and/or QGTKSTYLE. +# If set, Qt will be built with support for: +# - Common UNIX Printing System (CUPS) +# - Network Audio System (NAS) +# - Qt style that renders using GTK (QGTKSTYLE) .if !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include) -Qt_Include_MAINTAINER= kde@freebsd.org +Qt_Include_MAINTAINER= kde@FreeBSD.org Qt_Pre_Include= bsd.qt.mk .if !defined(QT_NONSTANDARD) CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \ - --with-qt-libraries=${QT_LIBDIR} \ - --with-extra-libs=${LOCALBASE}/lib \ - --with-extra-includes=${LOCALBASE}/include + --with-qt-libraries=${QT_LIBDIR} \ + --with-extra-libs=${LOCALBASE}/lib \ + --with-extra-includes=${LOCALBASE}/include CONFIGURE_ENV+= MOC="${MOC}" UIC="${UIC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \ QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" QTDIR="${QT_PREFIX}" MAKE_ENV+= QMAKESPEC="${QMAKESPEC}" @@ -24,7 +33,7 @@ MAKE_ENV+= QMAKESPEC="${QMAKESPEC}" .if defined(QT_DIST) MD5_FILE= ${PORTSDIR}/devel/qt4/distinfo MASTER_SITES= ${MASTER_SITE_QT} -DISTNAME= qt-x11-opensource-src-${QT4_VERSION} +DISTNAME= qt-everywhere-opensource-src-${QT4_VERSION} DIST_SUBDIR= KDE #CONFLICTS+= Currently there are no conflicts \o/ @@ -57,7 +66,7 @@ CONFIGURE_ARGS+=-no-mmx -no-3dnow -no-sse -no-sse2 # CONFIGURE_ARGS+=-no-exceptions # .endif -.if defined(WANT_QT_DEBUG) +.if defined(WANT_QT_DEBUG) || defined(WITH_DEBUG) CONFIGURE_ARGS+=-debug PLIST_SUB+= DEBUG="" .else @@ -84,6 +93,7 @@ QT_LIBDIR?= ${QT_PREFIX}/${QT_LIBDIR_REL} QT_PLUGINDIR?= ${QT_PREFIX}/${QT_PLUGINDIR_REL} MOC?= ${QT_PREFIX}/bin/moc-qt4 UIC?= ${QT_PREFIX}/bin/uic-qt4 +RCC?= ${QT_PREFIX}/bin/rcc QMAKE?= ${QT_PREFIX}/bin/qmake-qt4 QMAKESPEC?= ${QT_PREFIX}/share/qt4/mkspecs/freebsd-g++ QMAKEFLAGS+= QMAKE_CC="${CC}" QMAKE_CXX="${CXX}" QMAKE_LINK_SHLIB="${CXX}" \ @@ -103,95 +113,214 @@ QTCGFLIBS?= # # QT4 version -# Don't forget to update ${PORTSDIR}/devel/qt4/files/configure ! +# Don't forget to update ${PORTSDIR}/devel/qt4/files/patch-configure ! # -QT4_VERSION?= 4.5.3 +QT4_VERSION?= 4.6.1 _QT_COMPONENTS_ALL= accessible assistant assistant-adp assistantclient \ clucene codecs-cn codecs-jp codecs-kr codecs-tw corelib \ - dbus designer doc help help-tools gui iconengines imageformats \ - inputmethods linguist l10n makeqpf moc network opengl \ - pixeltool porting phonon phonon-gst qdbusviewer qdoc3 \ + dbus demo designer doc help help-tools gui iconengines imageformats \ + inputmethods linguist l10n makeqpf moc multimedia network \ + opengl pixeltool porting phonon phonon-gst qdbusviewer qdoc3 \ qmake qt3support qtconfig qtestlib qvfb rcc script scripttools \ - sql svg uic uic3 webkit xml xmlpatterns xmlpatterns-tool - -accessible_DEPENDS= accessibility/qt4-accessible -assistant_DEPENDS= devel/qt4-assistant -assistant-adp_DEPENDS= devel/qt4-assistant-adp -assistantclient_DEPENDS=devel/qt4-libqtassistantclient -assistantclient_NAME= libQtAssistantClient -clucene_DEPENDS= textproc/qt4-clucene -codecs-cn_DEPENDS= chinese/qt4-codecs-cn -codecs-jp_DEPENDS= japanese/qt4-codecs-jp -codecs-kr_DEPENDS= korean/qt4-codecs-kr -codecs-tw_DEPENDS= chinese/qt4-codecs-tw -corelib_DEPENDS= devel/qt4-corelib -dbus_DEPENDS= devel/dbus-qt4 -designer_DEPENDS= devel/qt4-designer -doc_DEPENDS= misc/qt4-doc -gui_DEPENDS= x11-toolkits/qt4-gui -help_DEPENDS= devel/qt4-help -help-tools_DEPENDS= devel/qt4-help-tools -iconengines_DEPENDS= graphics/qt4-iconengines -imageformats_DEPENDS= graphics/qt4-imageformats -inputmethods_DEPENDS= x11/qt4-inputmethods -linguist_DEPENDS= devel/qt4-linguist -l10n_DEPENDS= misc/qt4-l10n -makeqpf_DEPENDS= devel/qt4-makeqpf -moc_DEPENDS= devel/qt4-moc -network_DEPENDS= net/qt4-network -opengl_DEPENDS= x11/qt4-opengl -pixeltool_DEPENDS= graphics/qt4-pixeltool -phonon_DEPENDS= multimedia/qt4-phonon -phonon-gst_DEPENDS= multimedia/qt4-phonon-gst -porting_DEPENDS= devel/qt4-porting -qdbusviewer_DEPENDS= devel/qt4-qdbusviewer -qdoc3_DEPENDS= devel/qt4-qdoc3 -qmake_DEPENDS= devel/qmake4 -qt3support_DEPENDS= devel/qt4-qt3support -qtconfig_DEPENDS= misc/qt4-qtconfig -qtestlib_DEPENDS= devel/qt4-qtestlib -qvfb_DEPENDS= devel/qt4-qvfb -rcc_DEPENDS= devel/qt4-rcc -script_DEPENDS= devel/qt4-script -scripttools_DEPENDS= devel/qt4-scripttools -sql_DEPENDS= databases/qt4-sql -svg_DEPENDS= graphics/qt4-svg -uic_DEPENDS= devel/qt4-uic -uic3_DEPENDS= devel/qt4-uic3 -webkit_DEPENDS= www/qt4-webkit -xml_DEPENDS= textproc/qt4-xml -xmlpatterns_DEPENDS= textproc/qt4-xmlpatterns -xmlpatterns-tool_DEPENDS= textproc/qt4-xmlpatterns-tool + sql sql-ibase sql-mysql sql-odbc sql-pgsql sql-sqlite2 sql-sqlite3 \ + svg uic uic3 webkit xml xmlpatterns xmlpatterns-tool -.if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include) -Qt_Post_Include= bsd.qt.mk +accessible_PORT= accessibility/qt4-accessible +accessible_DEPENDS= ${QT_PLUGINDIR}/accessible/libqtaccessiblewidgets.so -.for component in ${_QT_COMPONENTS_ALL} -${component}_build_DEPENDS= ${${component}_DEPENDS} -${component}_run_DEPENDS= ${${component}_DEPENDS} -_QT_COMPONENTS_SUFFIXED+=${component} ${component}_build ${component}_run -.endfor +assistant_PORT= devel/qt4-assistant +assistant_DEPENDS= ${QT_PREFIX}/bin/assistant-qt4 -.if defined(QT_COMPONENTS) -.for ext in ${QT_COMPONENTS} -${ext}_QT4_PREFIX?= qt4- -${ext}_QT4_VERSION?= ${QT4_VERSION} -${ext}_NAME?= ${ext} -_${ext}= ${ext} -.if ${_QT_COMPONENTS_SUFFIXED:M${ext}}!= "" -.if ${_${ext}:M*_build}!= "" -BUILD_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME:S/_build//}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS} -.elif ${_${ext}:M*_run}!= "" -RUN_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME:S/_run//}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS} +assistant-adp_PORT= devel/qt4-assistant-adp +assistant-adp_DEPENDS= ${QT_PREFIX}/bin/assistant_adp + +assistantclient_PORT= devel/qt4-libqtassistantclient +assistantclient_DEPENDS= ${QT_LIBDIR}/libQtAssistantClient.so + +clucene_PORT= textproc/qt4-clucene +clucene_DEPENDS= ${QT_LIBDIR}/libQtCLucene.so + +codecs-cn_PORT= chinese/qt4-codecs-cn +codecs-cn_DEPENDS= ${QT_PLUGINDIR}/codecs/libqcncodecs.so + +codecs-jp_PORT= japanese/qt4-codecs-jp +codecs-jp_DEPENDS= ${QT_PLUGINDIR}/codecs/libqjpcodecs.so + +codecs-kr_PORT= korean/qt4-codecs-kr +codecs-kr_DEPENDS= ${QT_PLUGINDIR}/codecs/libqkrcodecs.so + +codecs-tw_PORT= chinese/qt4-codecs-tw +codecs-tw_DEPENDS= ${QT_PLUGINDIR}/codecs/libqtwcodecs.so + +corelib_PORT= devel/qt4-corelib +corelib_DEPENDS= ${QT_LIBDIR}/libQtCore.so + +dbus_PORT= devel/dbus-qt4 +dbus_DEPENDS= ${QT_LIBDIR}/libQtDBus.so + +demo_PORT= misc/qt4-qtdemo +demo_DEPENDS= ${QT_PREFIX}/bin/qtdemo + +designer_PORT= devel/qt4-designer +designer_DEPENDS= ${QT_PREFIX}/bin/designer-qt4 + +doc_PORT= misc/qt4-doc +doc_DEPENDS= qt4-doc>=4 + +gui_PORT= x11-toolkits/qt4-gui +gui_DEPENDS= ${QT_LIBDIR}/libQtGui.so + +help_PORT= devel/qt4-help +help_DEPENDS= ${QT_LIBDIR}/libQtHelp.so + +help-tools_PORT= devel/qt4-help-tools +help-tools_DEPENDS= ${QT_PREFIX}/bin/qhelpgenerator + +iconengines_PORT= graphics/qt4-iconengines +iconengines_DEPENDS= ${QT_PLUGINDIR}/iconengines/libqsvgicon.so + +imageformats_PORT= graphics/qt4-imageformats +imageformats_DEPENDS= ${QT_PLUGINDIR}/imageformats/libqjpeg.so + +inputmethods_PORT= x11/qt4-inputmethods +inputmethods_DEPENDS= ${QT_PLUGINDIR}/inputmethods/libqimsw-multi.so + +linguist_PORT= devel/qt4-linguist +linguist_DEPENDS= ${QT_PREFIX}/bin/linguist-qt4 + +l10n_PORT= misc/qt4-l10n +l10n_DEPENDS= qt4-l10n>=4 + +makeqpf_PORT= devel/qt4-makeqpf +makeqpf_DEPENDS= ${QT_PREFIX}/bin/makeqpf-qt4 + +moc_PORT= devel/qt4-moc +moc_DEPENDS= ${MOC} + +multimedia_PORT= multimedia/qt4-multimedia +multimedia_DEPENDS= ${QT_LIBDIR}/libQtMultimedia.so + +network_PORT= net/qt4-network +network_DEPENDS= ${QT_LIBDIR}/libQtNetwork.so + +opengl_PORT= x11/qt4-opengl +opengl_DEPENDS= ${QT_LIBDIR}/libQtOpenGL.so + +pixeltool_PORT= graphics/qt4-pixeltool +pixeltool_DEPENDS= ${QT_PREFIX}/bin/pixeltool + +.if defined(WITH_KDE_PHONON) +phonon_PORT= multimedia/phonon .else -BUILD_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS} -RUN_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS} +phonon_PORT= multimedia/qt4-phonon .endif +phonon_DEPENDS= ${QT_LIBDIR}/libphonon.so + +.if defined(WITH_KDE_PHONON) +phonon-gst_PORT= multimedia/phonon-gstreamer .else -IGNORE= cannot install: unknown Qt4 component -- ${ext} +phonon-gst_PORT= multimedia/qt4-phonon-gst .endif +phonon-gst_DEPENDS= ${QT_PLUGINDIR}/phonon_backend/libphonon_gstreamer.so + +porting_PORT= devel/qt4-porting +porting_DEPENDS= ${QT_PREFIX}/bin/qt3to4 + +qdbusviewer_PORT= devel/qt4-qdbusviewer +qdbusviewer_DEPENDS= ${QT_PREFIX}/bin/qdbusviewer + +qdoc3_PORT= devel/qt4-qdoc3 +qdoc3_DEPENDS= ${QT_PREFIX}/bin/qdoc3 + +qmake_PORT= devel/qmake4 +qmake_DEPENDS= ${QMAKE} + +qt3support_PORT= devel/qt4-qt3support +qt3support_DEPENDS= ${QT_LIBDIR}/libQt3Support.so + +qtconfig_PORT= misc/qt4-qtconfig +qtconfig_DEPENDS= ${QT_PREFIX}/bin/qtconfig-qt4 + +qtestlib_PORT= devel/qt4-qtestlib +qtestlib_DEPENDS= ${QT_LIBDIR}/libQtTest.so + +qvfb_PORT= devel/qt4-qvfb +qvfb_DEPENDS= ${QT_PREFIX}/bin/qvfb-qt4 + +rcc_PORT= devel/qt4-rcc +rcc_DEPENDS= ${RCC} + +script_PORT= devel/qt4-script +script_DEPENDS= ${QT_LIBDIR}/libQtScript.so + +scripttools_PORT= devel/qt4-scripttools +scripttools_DEPENDS= ${QT_LIBDIR}/libQtScriptTools.so + +sql_PORT= databases/qt4-sql +sql_DEPENDS= ${QT_LIBDIR}/libQtSql.so + +sql-ibase_PORT= databases/qt4-ibase-plugin +sql-ibase_DEPENDS= ${QT_PLUGINDIR}/sqldrivers/libqsqlibase.so + +sql-mysql_PORT= databases/qt4-mysql-plugin +sql-mysql_DEPENDS= ${QT_PLUGINDIR}/sqldrivers/libqsqlmysql.so + +sql-odbc_PORT= databases/qt4-odbc-plugin +sql-odbc_DEPENDS= ${QT_PLUGINDIR}/sqldrivers/libqsqlodbc.so + +sql-pgsql_PORT= databases/qt4-pgsql-plugin +sql-pgsql_DEPENDS= ${QT_PLUGINDIR}/sqldrivers/libqsqlpsql.so + +sql-sqlite2_PORT= databases/qt4-sqlite-plugin +sql-sqlite2_DEPENDS= ${QT_PLUGINDIR}/sqldrivers/libqsqlite2.so + +sql-sqlite3_PORT= databases/qt4-sqlite3-plugin +sql-sqlite3_DEPENDS= ${QT_PLUGINDIR}/sqldrivers/libqsqlite.so + +svg_PORT= graphics/qt4-svg +svg_DEPENDS= ${QT_LIBDIR}/libQtSvg.so + +uic_PORT= devel/qt4-uic +uic_DEPENDS= ${UIC} + +uic3_PORT= devel/qt4-uic3 +uic3_DEPENDS= ${QT_PREFIX}/bin/uic3 + +webkit_PORT= www/qt4-webkit +webkit_DEPENDS= ${QT_LIBDIR}/libQtWebKit.so + +xml_PORT= textproc/qt4-xml +xml_DEPENDS= ${QT_LIBDIR}/libQtXml.so + +xmlpatterns_PORT= textproc/qt4-xmlpatterns +xmlpatterns_DEPENDS= ${QT_LIBDIR}/libQtXmlPatterns.so + +xmlpatterns-tool_PORT= textproc/qt4-xmlpatterns-tool +xmlpatterns-tool_DEPENDS= ${QT_PREFIX}/bin/xmlpatterns + +.if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include) +Qt_Post_Include= bsd.qt.mk + +.for component in ${_QT_COMPONENTS_ALL} +${component}_BUILD_DEPENDS?= ${${component}_DEPENDS}:${PORTSDIR}/${${component}_PORT} +${component}_RUN_DEPENDS?= ${${component}_DEPENDS}:${PORTSDIR}/${${component}_PORT} + +${component}_build_BUILD_DEPENDS?= ${${component}_BUILD_DEPENDS} +${component}_run_RUN_DEPENDS?= ${${component}_RUN_DEPENDS} + +_QT_COMPONENTS_ALL_SUFFIXED+= ${component} ${component}_build ${component}_run .endfor + +.if defined(QT_COMPONENTS) +. for component in ${QT_COMPONENTS:O:u} +. if ${_QT_COMPONENTS_ALL_SUFFIXED:M${component}}!= "" +BUILD_DEPENDS+= ${${component}_BUILD_DEPENDS} +RUN_DEPENDS+= ${${component}_RUN_DEPENDS} +. else +IGNORE= can't be installed: unknown Qt 4 component '${component}' +. endif +. endfor .endif .endif diff --git a/accessibility/qt4-accessible/Makefile b/accessibility/qt4-accessible/Makefile index 4197cff2c9e4..7f8009ebd053 100644 --- a/accessibility/qt4-accessible/Makefile +++ b/accessibility/qt4-accessible/Makefile @@ -8,7 +8,6 @@ PORTNAME= accessible PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 CATEGORIES?= accessibility PKGNAMEPREFIX= qt4- @@ -29,22 +28,26 @@ 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/opengl src/phonon \ - src/script src/svg src/testlib \ - src/tools src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/multimedia src/network src/opengl \ + src/openvg src/phonon src/s60installs src/s60main src/script \ + src/scripttools src/sql src/svg src/testlib src/tools \ + src/winmain src/xml src/xmlpatterns src/3rdparty/clucene \ + src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ + src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ + src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/plugins/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../.. +BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-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 + ${MKDIR} ${WRKSRC}/mkspecs + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake + ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc .include <bsd.port.mk> diff --git a/accessibility/qt4-accessible/pkg-descr b/accessibility/qt4-accessible/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/accessibility/qt4-accessible/pkg-descr +++ b/accessibility/qt4-accessible/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/accessibility/qt4-accessible/pkg-plist b/accessibility/qt4-accessible/pkg-plist index b8588dd81f60..fd9cdd7d7716 100644 --- a/accessibility/qt4-accessible/pkg-plist +++ b/accessibility/qt4-accessible/pkg-plist @@ -1,5 +1,6 @@ -lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so -%%DEBUG%%lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so.debug -lib/qt4/plugins/accessible/libqtaccessiblewidgets.so -%%DEBUG%%lib/qt4/plugins/accessible/libqtaccessiblewidgets.so.debug -@dirrm lib/qt4/plugins/accessible +%%QT_PLUGINDIR_REL%%/accessible/libqtaccessiblecompatwidgets.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/accessible/libqtaccessiblecompatwidgets.so.debug +%%QT_PLUGINDIR_REL%%/accessible/libqtaccessiblewidgets.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/accessible/libqtaccessiblewidgets.so.debug +@dirrm %%QT_PLUGINDIR_REL%%/accessible +@dirrmtry %%QT_PLUGINDIR_REL%% diff --git a/chinese/qt4-codecs-cn/Makefile b/chinese/qt4-codecs-cn/Makefile index 70f49cd7da18..5e513020a6df 100644 --- a/chinese/qt4-codecs-cn/Makefile +++ b/chinese/qt4-codecs-cn/Makefile @@ -28,24 +28,28 @@ 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/gui src/network src/opengl src/phonon \ - src/qt3support src/script src/sql src/svg src/testlib \ - src/tools src/xml src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/gui src/multimedia src/network \ + src/opengl src/openvg src/phonon src/qt3support \ + src/s60installs src/s60main src/script src/scripttools src/sql \ + src/svg src/testlib src/tools src/winmain src/xml \ + src/xmlpatterns src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/plugins/${PORTNAME}/cn -CONFIGURE_WRKSRC=${WRKSRC}/../../../.. +BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/cn +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} - ${MKDIR} ${WRKSRC}/../../../mkspecs - ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../../bin/qmake + ${MKDIR} ${WRKSRC}/mkspecs + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake post-configure: - ${REINPLACE_CMD} -e 's|(test -z.*||g' ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e 's|(test -z.*||g' ${BUILD_WRKSRC}/Makefile .include <bsd.port.mk> diff --git a/chinese/qt4-codecs-cn/pkg-descr b/chinese/qt4-codecs-cn/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/chinese/qt4-codecs-cn/pkg-descr +++ b/chinese/qt4-codecs-cn/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/chinese/qt4-codecs-cn/pkg-plist b/chinese/qt4-codecs-cn/pkg-plist index 45e637f5e3d8..23f1123ec7bc 100644 --- a/chinese/qt4-codecs-cn/pkg-plist +++ b/chinese/qt4-codecs-cn/pkg-plist @@ -1,3 +1,4 @@ -lib/qt4/plugins/codecs/libqcncodecs.so -%%DEBUG%%lib/qt4/plugins/codecs/libqcncodecs.so.debug -@dirrmtry lib/qt4/plugins/codecs +%%QT_PLUGINDIR_REL%%/codecs/libqcncodecs.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/codecs/libqcncodecs.so.debug +@dirrmtry %%QT_PLUGINDIR_REL%%/codecs +@dirrmtry %%QT_PLUGINDIR_REL%% diff --git a/chinese/qt4-codecs-tw/Makefile b/chinese/qt4-codecs-tw/Makefile index 85b696a3ca39..de4e50abe279 100644 --- a/chinese/qt4-codecs-tw/Makefile +++ b/chinese/qt4-codecs-tw/Makefile @@ -27,25 +27,29 @@ 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 qmake tools translations \ - src/dbus src/gui src/network src/opengl src/phonon \ - src/qt3support src/script src/sql src/svg src/testlib \ - src/tools src/xml src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit +DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ + src/activeqt src/dbus src/gui src/multimedia src/network \ + src/opengl src/openvg src/phonon src/qt3support \ + src/s60installs src/s60main src/script src/scripttools src/sql \ + src/svg src/testlib src/tools src/winmain src/xml \ + src/xmlpatterns src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/plugins/${PORTNAME}/tw -CONFIGURE_WRKSRC=${WRKSRC}/../../../.. +BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/tw +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} - ${MKDIR} ${WRKSRC}/../../../mkspecs - ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../../bin/qmake + ${MKDIR} ${WRKSRC}/mkspecs + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake post-configure: - ${REINPLACE_CMD} -e 's|(test -z.*||g' ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e 's|(test -z.*||g' ${BUILD_WRKSRC}/Makefile .include <bsd.port.mk> diff --git a/chinese/qt4-codecs-tw/pkg-descr b/chinese/qt4-codecs-tw/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/chinese/qt4-codecs-tw/pkg-descr +++ b/chinese/qt4-codecs-tw/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/chinese/qt4-codecs-tw/pkg-plist b/chinese/qt4-codecs-tw/pkg-plist index 629f720d547f..fe0474393f7f 100644 --- a/chinese/qt4-codecs-tw/pkg-plist +++ b/chinese/qt4-codecs-tw/pkg-plist @@ -1,3 +1,4 @@ -lib/qt4/plugins/codecs/libqtwcodecs.so -%%DEBUG%%lib/qt4/plugins/codecs/libqtwcodecs.so.debug -@dirrmtry lib/qt4/plugins/codecs +%%QT_PLUGINDIR_REL%%/codecs/libqtwcodecs.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/codecs/libqtwcodecs.so.debug +@dirrmtry %%QT_PLUGINDIR_REL%%/codecs +@dirrmtry %%QT_PLUGINDIR_REL%% diff --git a/databases/qt4-ibase-plugin/Makefile b/databases/qt4-ibase-plugin/Makefile index d5a27f01b542..370e4df3da3c 100644 --- a/databases/qt4-ibase-plugin/Makefile +++ b/databases/qt4-ibase-plugin/Makefile @@ -9,9 +9,6 @@ PORTNAME= qt4-${DB}-plugin PORTVERSION= ${QT4_VERSION} CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_QT} -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt IBase/Firebird database plugin @@ -22,8 +19,8 @@ USE_FIREBIRD= yes USE_QT_VER= 4 QT_COMPONENTS= moc_build sql QT_NONSTANDARD= yes +QT_DIST= yes MAKE_JOBS_SAFE= yes -MD5_FILE= ${PORTSDIR}/devel/qt4/distinfo DRIVER= src/sql/drivers/${DB} PLUGIN= src/plugins/sqldrivers/${DB} diff --git a/databases/qt4-ibase-plugin/pkg-plist b/databases/qt4-ibase-plugin/pkg-plist index 0a1084fe0ef5..d0c1a75ae12d 100644 --- a/databases/qt4-ibase-plugin/pkg-plist +++ b/databases/qt4-ibase-plugin/pkg-plist @@ -1,2 +1,3 @@ -lib/qt4/plugins/sqldrivers/libqsql%%DB%%.so -@dirrmtry lib/qt4/plugins/sqldrivers +%%QT_PLUGINDIR_REL%%/sqldrivers/libqsql%%DB%%.so +@dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers +@dirrmtry %%QT_PLUGINDIR_REL%% diff --git a/databases/qt4-mysql-plugin/Makefile b/databases/qt4-mysql-plugin/Makefile index 7bafc4a92756..1003a7886474 100644 --- a/databases/qt4-mysql-plugin/Makefile +++ b/databases/qt4-mysql-plugin/Makefile @@ -9,9 +9,6 @@ PORTNAME= qt4-${DB}-plugin PORTVERSION= ${QT4_VERSION} CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_QT} -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt MySQL database plugin @@ -21,8 +18,8 @@ DB= mysql USE_QT_VER= 4 QT_COMPONENTS= moc_build sql QT_NONSTANDARD= yes +QT_DIST= yes MAKE_JOBS_SAFE= yes -MD5_FILE= ${PORTSDIR}/devel/qt4/distinfo USE_MYSQL= yes DRIVER= src/sql/drivers/${DB} diff --git a/databases/qt4-mysql-plugin/pkg-plist b/databases/qt4-mysql-plugin/pkg-plist index 0a1084fe0ef5..d0c1a75ae12d 100644 --- a/databases/qt4-mysql-plugin/pkg-plist +++ b/databases/qt4-mysql-plugin/pkg-plist @@ -1,2 +1,3 @@ -lib/qt4/plugins/sqldrivers/libqsql%%DB%%.so -@dirrmtry lib/qt4/plugins/sqldrivers +%%QT_PLUGINDIR_REL%%/sqldrivers/libqsql%%DB%%.so +@dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers +@dirrmtry %%QT_PLUGINDIR_REL%% diff --git a/databases/qt4-odbc-plugin/Makefile b/databases/qt4-odbc-plugin/Makefile index a8cb627ba918..fef28c8cda3b 100644 --- a/databases/qt4-odbc-plugin/Makefile +++ b/databases/qt4-odbc-plugin/Makefile @@ -9,22 +9,19 @@ PORTNAME= qt4-${DB}-plugin PORTVERSION= ${QT4_VERSION} CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_QT} -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt ODBC database plugin DB= odbc -LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC +LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc USE_QT_VER= 4 QT_COMPONENTS= moc_build sql QT_NONSTANDARD= yes +QT_DIST= yes MAKE_JOBS_SAFE= yes -MD5_FILE= ${PORTSDIR}/devel/qt4/distinfo DRIVER= src/sql/drivers/${DB} PLUGIN= src/plugins/sqldrivers/${DB} diff --git a/databases/qt4-odbc-plugin/pkg-plist b/databases/qt4-odbc-plugin/pkg-plist index 0a1084fe0ef5..d0c1a75ae12d 100644 --- a/databases/qt4-odbc-plugin/pkg-plist +++ b/databases/qt4-odbc-plugin/pkg-plist @@ -1,2 +1,3 @@ -lib/qt4/plugins/sqldrivers/libqsql%%DB%%.so -@dirrmtry lib/qt4/plugins/sqldrivers +%%QT_PLUGINDIR_REL%%/sqldrivers/libqsql%%DB%%.so +@dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers +@dirrmtry %%QT_PLUGINDIR_REL%% diff --git a/databases/qt4-pgsql-plugin/Makefile b/databases/qt4-pgsql-plugin/Makefile index a0136b6ce952..be1acceef7d6 100644 --- a/databases/qt4-pgsql-plugin/Makefile +++ b/databases/qt4-pgsql-plugin/Makefile @@ -9,9 +9,6 @@ PORTNAME= qt4-${DB}-plugin PORTVERSION= ${QT4_VERSION} CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_QT} -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt PostgreSQL database plugin @@ -21,8 +18,8 @@ DB= psql USE_QT_VER= 4 QT_COMPONENTS= moc_build sql QT_NONSTANDARD= yes +QT_DIST= yes MAKE_JOBS_SAFE= yes -MD5_FILE= ${PORTSDIR}/devel/qt4/distinfo USE_PGSQL= yes DRIVER= src/sql/drivers/${DB} diff --git a/databases/qt4-pgsql-plugin/pkg-plist b/databases/qt4-pgsql-plugin/pkg-plist index 0a1084fe0ef5..d0c1a75ae12d 100644 --- a/databases/qt4-pgsql-plugin/pkg-plist +++ b/databases/qt4-pgsql-plugin/pkg-plist @@ -1,2 +1,3 @@ -lib/qt4/plugins/sqldrivers/libqsql%%DB%%.so -@dirrmtry lib/qt4/plugins/sqldrivers +%%QT_PLUGINDIR_REL%%/sqldrivers/libqsql%%DB%%.so +@dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers +@dirrmtry %%QT_PLUGINDIR_REL%% diff --git a/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile index f16da4ea5549..23336e26b79d 100644 --- a/databases/qt4-sql/Makefile +++ b/databases/qt4-sql/Makefile @@ -8,7 +8,6 @@ PORTNAME= sql PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= databases PKGNAMEPREFIX= qt4- @@ -19,7 +18,7 @@ USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build corelib QT_NONSTANDARD= yes QT_DIST= yes -MAKE_JOBS_SAFE= yes +MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/qt4 @@ -30,29 +29,34 @@ 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/gui src/network src/opengl src/phonon \ - src/qt3support src/script src/svg src/testlib \ - src/tools src/xml src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/gui src/multimedia src/network \ + src/opengl src/openvg src/phonon src/qt3support \ + src/s60installs src/s60main src/script src/scripttools src/svg \ + src/testlib src/tools src/winmain src/xml src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../ +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-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 + ${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 + -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' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ - ${WRKSRC}/../../lib/pkgconfig/QtSql.pc + ${WRKSRC}/lib/pkgconfig/QtSql.pc .include <bsd.port.mk> diff --git a/databases/qt4-sql/pkg-descr b/databases/qt4-sql/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/databases/qt4-sql/pkg-descr +++ b/databases/qt4-sql/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/databases/qt4-sql/pkg-plist b/databases/qt4-sql/pkg-plist index dd0cd29bcd9c..6c77bc64fd9a 100644 --- a/databases/qt4-sql/pkg-plist +++ b/databases/qt4-sql/pkg-plist @@ -1,14 +1,14 @@ include/qt4/Qt/QtSql include/qt4/Qt/qsql.h include/qt4/Qt/qsql_db2.h -include/qt4/Qt/qsql_oci.h -include/qt4/Qt/qsql_tds.h include/qt4/Qt/qsql_ibase.h include/qt4/Qt/qsql_mysql.h +include/qt4/Qt/qsql_oci.h include/qt4/Qt/qsql_odbc.h include/qt4/Qt/qsql_psql.h include/qt4/Qt/qsql_sqlite.h include/qt4/Qt/qsql_sqlite2.h +include/qt4/Qt/qsql_tds.h include/qt4/Qt/qsqldatabase.h include/qt4/Qt/qsqldriver.h include/qt4/Qt/qsqldriverplugin.h @@ -22,10 +22,14 @@ include/qt4/Qt/qsqlrelationaldelegate.h include/qt4/Qt/qsqlrelationaltablemodel.h include/qt4/Qt/qsqlresult.h include/qt4/Qt/qsqltablemodel.h +include/qt4/QtSql/QDB2Driver +include/qt4/QtSql/QDB2Result include/qt4/QtSql/QIBaseDriver include/qt4/QtSql/QIBaseResult include/qt4/QtSql/QMYSQLDriver include/qt4/QtSql/QMYSQLResult +include/qt4/QtSql/QOCIDriver +include/qt4/QtSql/QOCIResult include/qt4/QtSql/QODBCDriver include/qt4/QtSql/QODBCResult include/qt4/QtSql/QPSQLDriver @@ -51,23 +55,19 @@ include/qt4/QtSql/QSqlRelationalDelegate include/qt4/QtSql/QSqlRelationalTableModel include/qt4/QtSql/QSqlResult include/qt4/QtSql/QSqlTableModel +include/qt4/QtSql/QTDSDriver +include/qt4/QtSql/QTDSResult include/qt4/QtSql/QtSql include/qt4/QtSql/qsql.h +include/qt4/QtSql/qsql_db2.h include/qt4/QtSql/qsql_ibase.h include/qt4/QtSql/qsql_mysql.h -include/qt4/QtSql/qsql_db2.h include/qt4/QtSql/qsql_oci.h -include/qt4/QtSql/qsql_tds.h -include/qt4/QtSql/QDB2Result -include/qt4/QtSql/QDB2Driver -include/qt4/QtSql/QOCIResult -include/qt4/QtSql/QOCIDriver -include/qt4/QtSql/QTDSResult -include/qt4/QtSql/QTDSDriver include/qt4/QtSql/qsql_odbc.h include/qt4/QtSql/qsql_psql.h include/qt4/QtSql/qsql_sqlite.h include/qt4/QtSql/qsql_sqlite2.h +include/qt4/QtSql/qsql_tds.h include/qt4/QtSql/qsqldatabase.h include/qt4/QtSql/qsqldriver.h include/qt4/QtSql/qsqldriverplugin.h @@ -89,6 +89,7 @@ lib/qt4/libQtSql.so.%%SHLIB_SHVER%% lib/qt4/libQtSql.so.%%SHLIB_VER%% %%DEBUG%%lib/qt4/libQtSql.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtSql.pc +@dirrmtry lib/qt4 @dirrm include/qt4/QtSql @dirrmtry include/qt4/Qt @dirrmtry include/qt4 diff --git a/databases/qt4-sqlite-plugin/Makefile b/databases/qt4-sqlite-plugin/Makefile index 3b02cb98dbdd..78beca184c98 100644 --- a/databases/qt4-sqlite-plugin/Makefile +++ b/databases/qt4-sqlite-plugin/Makefile @@ -9,9 +9,6 @@ PORTNAME= qt4-${DB}-plugin PORTVERSION= ${QT4_VERSION} CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_QT} -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt SQLite 2.x database plugin @@ -21,10 +18,10 @@ DB= sqlite2 LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 USE_QT_VER= 4 -QT_COMPONENTS= moc_build sql +QT_COMPONENTS= moc_build sql QT_NONSTANDARD= yes +QT_DIST= yes MAKE_JOBS_SAFE= yes -MD5_FILE= ${PORTSDIR}/devel/qt4/distinfo DRIVER= src/sql/drivers/${DB} PLUGIN= src/plugins/sqldrivers/${DB} diff --git a/databases/qt4-sqlite-plugin/pkg-plist b/databases/qt4-sqlite-plugin/pkg-plist index e6aacc20fb20..8a857e2e4422 100644 --- a/databases/qt4-sqlite-plugin/pkg-plist +++ b/databases/qt4-sqlite-plugin/pkg-plist @@ -1,2 +1,3 @@ -lib/qt4/plugins/sqldrivers/libq%%DB%%.so -@dirrmtry lib/qt4/plugins/sqldrivers +%%QT_PLUGINDIR_REL%%/sqldrivers/libq%%DB%%.so +@dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers +@dirrmtry %%QT_PLUGINDIR_REL%% diff --git a/databases/qt4-sqlite3-plugin/Makefile b/databases/qt4-sqlite3-plugin/Makefile index 6b97509e3893..9f7dff7d2d64 100644 --- a/databases/qt4-sqlite3-plugin/Makefile +++ b/databases/qt4-sqlite3-plugin/Makefile @@ -9,9 +9,6 @@ PORTNAME= qt4-${DB}-plugin PORTVERSION= ${QT4_VERSION} CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_QT} -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt SQLite 3.x database plugin @@ -24,6 +21,7 @@ LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3 USE_QT_VER= 4 QT_COMPONENTS= moc_build sql QT_NONSTANDARD= yes +QT_DIST= yes MAKE_JOBS_SAFE= yes DRIVER= src/sql/drivers/${DB} diff --git a/databases/qt4-sqlite3-plugin/pkg-plist b/databases/qt4-sqlite3-plugin/pkg-plist index e6aacc20fb20..8a857e2e4422 100644 --- a/databases/qt4-sqlite3-plugin/pkg-plist +++ b/databases/qt4-sqlite3-plugin/pkg-plist @@ -1,2 +1,3 @@ -lib/qt4/plugins/sqldrivers/libq%%DB%%.so -@dirrmtry lib/qt4/plugins/sqldrivers +%%QT_PLUGINDIR_REL%%/sqldrivers/libq%%DB%%.so +@dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers +@dirrmtry %%QT_PLUGINDIR_REL%% diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile index e863c816651f..f5fb5df3341f 100644 --- a/devel/dbus-qt4/Makefile +++ b/devel/dbus-qt4/Makefile @@ -8,7 +8,6 @@ PORTNAME= dbus PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -22,6 +21,7 @@ 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 @@ -31,33 +31,37 @@ MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ PATH=${WRKSRC}/bin:$$PATH 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/activeqt src/gui src/multimedia src/network src/opengl \ + src/openvg src/phonon src/qt3support src/s60installs \ + src/s60main src/script src/scripttools src/sql src/svg \ + src/testlib src/tools src/winmain src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/tools/qdbus -CONFIGURE_WRKSRC=${WRKSRC}/../../ +BUILD_WRKSRC= ${WRKSRC}/tools/qdbus +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} - ${REINPLACE_CMD} -e 's|qdbusviewer||g' ${WRKSRC}/qdbus.pro - ${REINPLACE_CMD} -e 's|SUBDIRS = qdbus|SUBDIRS = ../../src/dbus qdbus|g' ${WRKSRC}/qdbus.pro + ${REINPLACE_CMD} -e 's|qdbusviewer||g' ${BUILD_WRKSRC}/qdbus.pro + ${REINPLACE_CMD} -e 's|SUBDIRS = qdbus|SUBDIRS = ../../src/${PORTNAME} qdbus|g' ${BUILD_WRKSRC}/qdbus.pro ${REINPLACE_CMD} -e 's|"/moc"|"/moc-qt4"|' \ - ${WRKSRC}/../qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp - ${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 + ${BUILD_WRKSRC}/qdbuscpp2xml/qdbuscpp2xml.cpp + ${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' ${WRKSRC}/../../src/dbus/Makefile + ${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' ${WRKSRC}/src/${PORTNAME}/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/QtDBus.pc + ${WRKSRC}/lib/pkgconfig/QtDBus.pc .include <bsd.port.mk> diff --git a/devel/dbus-qt4/pkg-descr b/devel/dbus-qt4/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/devel/dbus-qt4/pkg-descr +++ b/devel/dbus-qt4/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/dbus-qt4/pkg-plist b/devel/dbus-qt4/pkg-plist index e2d6b09d304e..8ad0cb30264b 100644 --- a/devel/dbus-qt4/pkg-plist +++ b/devel/dbus-qt4/pkg-plist @@ -17,12 +17,14 @@ include/qt4/Qt/qdbusinterface.h include/qt4/Qt/qdbusmacros.h 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/Qt/qdbusreply.h +include/qt4/Qt/qdbusserver.h +include/qt4/Qt/qdbusservicewatcher.h include/qt4/QtDBus/QDBusAbstractAdaptor include/qt4/QtDBus/QDBusAbstractInterface +include/qt4/QtDBus/QDBusAbstractInterfaceBase include/qt4/QtDBus/QDBusArgument include/qt4/QtDBus/QDBusConnection include/qt4/QtDBus/QDBusConnectionInterface @@ -32,15 +34,16 @@ include/qt4/QtDBus/QDBusInterface include/qt4/QtDBus/QDBusMessage include/qt4/QtDBus/QDBusMetaType include/qt4/QtDBus/QDBusObjectPath +include/qt4/QtDBus/QDBusPendingCall +include/qt4/QtDBus/QDBusPendingCallWatcher +include/qt4/QtDBus/QDBusPendingReply +include/qt4/QtDBus/QDBusPendingReplyData include/qt4/QtDBus/QDBusReply include/qt4/QtDBus/QDBusServer +include/qt4/QtDBus/QDBusServiceWatcher 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 @@ -57,6 +60,7 @@ include/qt4/QtDBus/qdbuspendingcall.h include/qt4/QtDBus/qdbuspendingreply.h include/qt4/QtDBus/qdbusreply.h include/qt4/QtDBus/qdbusserver.h +include/qt4/QtDBus/qdbusservicewatcher.h lib/qt4/libQtDBus.la lib/qt4/libQtDBus.prl lib/qt4/libQtDBus.so @@ -65,6 +69,7 @@ lib/qt4/libQtDBus.so.%%SHLIB_SHVER%% lib/qt4/libQtDBus.so.%%SHLIB_VER%% %%DEBUG%%lib/qt4/libQtDBus.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtDBus.pc +@dirrmtry lib/qt4 @dirrm include/qt4/QtDBus @dirrmtry include/qt4/Qt @dirrmtry include/qt4 diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile index f92f4d4592b2..56ae69a69427 100644 --- a/devel/qmake4/Makefile +++ b/devel/qmake4/Makefile @@ -7,7 +7,6 @@ PORTNAME= qmake PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES= devel PKGNAMEPREFIX= qt4- @@ -17,13 +16,13 @@ COMMENT= The build utility of the Qt project QT_NONSTANDARD= yes QT_DIST= yes REINPLACE_ARGS= -i "" -WRKSRC= ${WRKDIR}/${DISTNAME}/qmake +WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME} MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= FILESDIR="${FILESDIR}" MAKE_JOBS_SAFE= yes +TODAY_CMD= /bin/date +%Y-%m-%d EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ - '${DISTNAME}/config.tests/unix/padstring' \ '${DISTNAME}/mkspecs' \ '${DISTNAME}/include/*/*' \ '${DISTNAME}/src/*/*.h' \ @@ -33,15 +32,14 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ '${DISTNAME}/src/corelib/global' \ '${DISTNAME}/src/corelib/plugin' \ '${DISTNAME}/src/corelib/kernel' \ - '${DISTNAME}/src/script' \ + '${DISTNAME}/src/corelib/codecs' \ + '${DISTNAME}/src/corelib/xml' \ '${DISTNAME}/src/3rdparty/md4' \ '${DISTNAME}/src/3rdparty/md5' \ '${DISTNAME}/src/3rdparty/sha1' post-patch: @${REINPLACE_CMD} -e 's|-O2|${CXXFLAGS}|' \ - -e 's|gcc.*|${CC}|' \ - -e 's|g++.*|${CXX}|' \ -e 's|/usr/local|${LOCALBASE}|' \ -e 's|/usr/X11R6|${LOCALBASE}|' \ -e 's|release|release thread|' \ @@ -53,12 +51,11 @@ post-patch: ${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' \ + -e "s|TODAY|$$(${TODAY_CMD})|g" \ < ${FILESDIR}/qconfig.cpp \ > ${WRKSRC:H}/src/corelib/global/qconfig.cpp ${ECHO} '/* empty */' > ${WRKSRC}/qconfig.h diff --git a/devel/qmake4/files/Makefile.bsd b/devel/qmake4/files/Makefile.bsd index 08ccc6fb6d8c..9d6eac70db42 100644 --- a/devel/qmake4/files/Makefile.bsd +++ b/devel/qmake4/files/Makefile.bsd @@ -9,19 +9,20 @@ 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 + ${.CURDIR:H}/src/corelib/kernel ${.CURDIR:H}/src/corelib/codecs \ + ${.CURDIR:H}/src/corelib/xml ${.CURDIR:H}/src/3rdparty/md4 \ + ${.CURDIR:H}/src/3rdparty/md5 ${.CURDIR:H}/src/3rdparty/sha1 CXXFLAGS+=-I${.CURDIR:H}/mkspecs/freebsd-g++ -.for s in src/corelib/arch/generic src/global src/tools src/kernel src/codecs \ +.for s in src/corelib/arch/generic src/corelib/global src/corelib/tools \ + src/corelib/kernel src/corelib/codecs \ src/3rdparty/md5 src/3rdparty/md4 src/3rdparty/sha1 \ - src/script include/QtCore include + include/QtCore include CXXFLAGS+=-I${.CURDIR:H}/$s .endfor -.for g in /. /unix /win32 /mac +.for g in /. /unix /win32 /mac /symbian .PATH: ${.CURDIR}/generators$g CXXFLAGS+=-I${.CURDIR}/generators$g .endfor @@ -30,7 +31,8 @@ CXXFLAGS+=-I. -I"${FILESDIR}" CXXFLAGS+=-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT \ -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 + -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT \ + -DQT_BOOTSTRAPPED -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 diff --git a/devel/qmake4/files/qconfig.cpp b/devel/qmake4/files/qconfig.cpp index d662b424fce0..bcbbe10ff17b 100644 --- a/devel/qmake4/files/qconfig.cpp +++ b/devel/qmake4/files/qconfig.cpp @@ -4,6 +4,9 @@ * The default prefix (/ usr / local) is dynamicly replaced * at configure time. */ +/* Installation date */ +static const char qt_configure_installation [12+11] = "qt_instdate=TODAY"; + #define QT_CONFIGURE_LICENSEE "Open Source"; #define QT_CONFIGURE_LICENSED_PRODUCTS "OpenSource"; #define QT_CONFIGURE_PREFIX_PATH "/usr/local"; diff --git a/devel/qmake4/pkg-descr b/devel/qmake4/pkg-descr index eccbc5d9c1e0..3ea2b0626dcc 100644 --- a/devel/qmake4/pkg-descr +++ b/devel/qmake4/pkg-descr @@ -5,4 +5,4 @@ source code. Qmake is a project and makefile creating utility, that is part of Qt. For ease of maintainance it is split out into a port of its own. -WWW: http://www.trolltech.com/products/qt/index.html +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qmake4/pkg-plist b/devel/qmake4/pkg-plist index fda1a09e3087..2d0f68521217 100644 --- a/devel/qmake4/pkg-plist +++ b/devel/qmake4/pkg-plist @@ -14,8 +14,12 @@ 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/symbian/qplatformdefs.h +share/qt4/mkspecs/common/symbian/stl-off/new +share/qt4/mkspecs/common/symbian/symbian.conf share/qt4/mkspecs/common/unix.conf -share/qt4/mkspecs/common/wince.conf +share/qt4/mkspecs/common/wince/qmake.conf +share/qt4/mkspecs/common/wince/qplatformdefs.h share/qt4/mkspecs/cygwin-g++/qmake.conf share/qt4/mkspecs/cygwin-g++/qplatformdefs.h share/qt4/mkspecs/darwin-g++/qmake.conf @@ -31,6 +35,7 @@ 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/egl.prf share/qt4/mkspecs/features/exclusive_builds.prf share/qt4/mkspecs/features/help.prf share/qt4/mkspecs/features/include_source_dir.prf @@ -64,6 +69,17 @@ 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/symbian/application_icon.prf +share/qt4/mkspecs/features/symbian/armcc_warnings.prf +share/qt4/mkspecs/features/symbian/data_caging_paths.prf +share/qt4/mkspecs/features/symbian/default_post.prf +share/qt4/mkspecs/features/symbian/default_pre.prf +share/qt4/mkspecs/features/symbian/epocallowdlldata.prf +share/qt4/mkspecs/features/symbian/moc.prf +share/qt4/mkspecs/features/symbian/platform_paths.prf +share/qt4/mkspecs/features/symbian/qt.prf +share/qt4/mkspecs/features/symbian/stl.prf +share/qt4/mkspecs/features/symbian/stl_off.prf share/qt4/mkspecs/features/uic.prf share/qt4/mkspecs/features/uitools.prf share/qt4/mkspecs/features/unix/bsymbolic_functions.prf @@ -71,6 +87,7 @@ 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/openvg.prf share/qt4/mkspecs/features/unix/separate_debug_info.prf share/qt4/mkspecs/features/unix/thread.prf share/qt4/mkspecs/features/unix/x11.prf @@ -78,6 +95,7 @@ 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/vxworks.prf share/qt4/mkspecs/features/warn_off.prf share/qt4/mkspecs/features/warn_on.prf share/qt4/mkspecs/features/win32/console.prf @@ -90,6 +108,7 @@ 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/openvg.prf share/qt4/mkspecs/features/win32/qaxcontainer.prf share/qt4/mkspecs/features/win32/qaxserver.prf share/qt4/mkspecs/features/win32/qt_dll.prf @@ -143,6 +162,8 @@ 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++-maemo/qmake.conf +share/qt4/mkspecs/linux-g++-maemo/qplatformdefs.h share/qt4/mkspecs/linux-g++/qmake.conf share/qt4/mkspecs/linux-g++/qplatformdefs.h share/qt4/mkspecs/linux-icc-32/qmake.conf @@ -165,6 +186,10 @@ 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++40/Info.plist.app +share/qt4/mkspecs/macx-g++40/Info.plist.lib +share/qt4/mkspecs/macx-g++40/qmake.conf +share/qt4/mkspecs/macx-g++40/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 @@ -212,8 +237,8 @@ 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-powerpc-g++/qmake.conf +share/qt4/mkspecs/qws/linux-powerpc-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 @@ -234,14 +259,25 @@ 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-stlport/qmake.conf +share/qt4/mkspecs/solaris-cc-64-stlport/qplatformdefs.h share/qt4/mkspecs/solaris-cc-64/qmake.conf share/qt4/mkspecs/solaris-cc-64/qplatformdefs.h +share/qt4/mkspecs/solaris-cc-stlport/qmake.conf +share/qt4/mkspecs/solaris-cc-stlport/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/symbian-abld/qmake.conf +share/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm +share/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm +share/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm +share/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm +share/qt4/mkspecs/symbian-sbsv2/flm/qt/qt.xml +share/qt4/mkspecs/symbian-sbsv2/qmake.conf share/qt4/mkspecs/tru64-cxx/qmake.conf share/qt4/mkspecs/tru64-cxx/qplatformdefs.h share/qt4/mkspecs/tru64-g++/qmake.conf @@ -250,6 +286,26 @@ 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/unsupported/linux-host-g++/qmake.conf +share/qt4/mkspecs/unsupported/linux-host-g++/qplatformdefs.h +share/qt4/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf +share/qt4/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h +share/qt4/mkspecs/unsupported/qnx-g++/qmake.conf +share/qt4/mkspecs/unsupported/qnx-g++/qplatformdefs.h +share/qt4/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf +share/qt4/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h +share/qt4/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf +share/qt4/mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h +share/qt4/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf +share/qt4/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h +share/qt4/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf +share/qt4/mkspecs/unsupported/vxworks-ppc-dcc/qplatformdefs.h +share/qt4/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf +share/qt4/mkspecs/unsupported/vxworks-ppc-g++/qplatformdefs.h +share/qt4/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf +share/qt4/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h +share/qt4/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf +share/qt4/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h share/qt4/mkspecs/win32-borland/qmake.conf share/qt4/mkspecs/win32-borland/qplatformdefs.h share/qt4/mkspecs/win32-g++/qmake.conf @@ -298,6 +354,8 @@ 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/wince60standard-x86-msvc2005/qmake.conf +share/qt4/mkspecs/wince60standard-x86-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 @@ -322,6 +380,14 @@ 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 +share/qt4/mkspecs/wincewm65professional-msvc2005/default_post.prf +share/qt4/mkspecs/wincewm65professional-msvc2005/qmake.conf +share/qt4/mkspecs/wincewm65professional-msvc2005/qplatformdefs.h +share/qt4/mkspecs/wincewm65professional-msvc2008/default_post.prf +share/qt4/mkspecs/wincewm65professional-msvc2008/qmake.conf +share/qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h +@dirrm share/qt4/mkspecs/wincewm65professional-msvc2008 +@dirrm share/qt4/mkspecs/wincewm65professional-msvc2005 @dirrm share/qt4/mkspecs/wincewm60standard-msvc2008 @dirrm share/qt4/mkspecs/wincewm60standard-msvc2005 @dirrm share/qt4/mkspecs/wincewm60professional-msvc2008 @@ -330,6 +396,7 @@ share/qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h @dirrm share/qt4/mkspecs/wincewm50smart-msvc2005 @dirrm share/qt4/mkspecs/wincewm50pocket-msvc2008 @dirrm share/qt4/mkspecs/wincewm50pocket-msvc2005 +@dirrm share/qt4/mkspecs/wince60standard-x86-msvc2005 @dirrm share/qt4/mkspecs/wince60standard-armv4i-msvc2005 @dirrm share/qt4/mkspecs/wince50standard-x86-msvc2008 @dirrm share/qt4/mkspecs/wince50standard-x86-msvc2005 @@ -351,12 +418,30 @@ share/qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h @dirrm share/qt4/mkspecs/win32-icc @dirrm share/qt4/mkspecs/win32-g++ @dirrm share/qt4/mkspecs/win32-borland +@dirrm share/qt4/mkspecs/unsupported/vxworks-simpentium-g++ +@dirrm share/qt4/mkspecs/unsupported/vxworks-simpentium-dcc +@dirrm share/qt4/mkspecs/unsupported/vxworks-ppc-g++ +@dirrm share/qt4/mkspecs/unsupported/vxworks-ppc-dcc +@dirrm share/qt4/mkspecs/unsupported/qws/qnx-ppc-g++ +@dirrm share/qt4/mkspecs/unsupported/qws/qnx-i386-g++ +@dirrm share/qt4/mkspecs/unsupported/qws/qnx-generic-g++ +@dirrm share/qt4/mkspecs/unsupported/qws +@dirrm share/qt4/mkspecs/unsupported/qnx-g++ +@dirrm share/qt4/mkspecs/unsupported/linux-scratchbox2-g++ +@dirrm share/qt4/mkspecs/unsupported/linux-host-g++ +@dirrm share/qt4/mkspecs/unsupported @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/symbian-sbsv2/flm/qt +@dirrm share/qt4/mkspecs/symbian-sbsv2/flm +@dirrm share/qt4/mkspecs/symbian-sbsv2 +@dirrm share/qt4/mkspecs/symbian-abld @dirrm share/qt4/mkspecs/solaris-g++-64 @dirrm share/qt4/mkspecs/solaris-g++ +@dirrm share/qt4/mkspecs/solaris-cc-stlport +@dirrm share/qt4/mkspecs/solaris-cc-64-stlport @dirrm share/qt4/mkspecs/solaris-cc-64 @dirrm share/qt4/mkspecs/solaris-cc @dirrm share/qt4/mkspecs/sco-g++ @@ -369,7 +454,7 @@ share/qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h @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-powerpc-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++ @@ -391,6 +476,7 @@ share/qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h @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++40 @dirrm share/qt4/mkspecs/macx-g++ @dirrm share/qt4/mkspecs/lynxos-g++ @dirrm share/qt4/mkspecs/linux-pgcc @@ -400,6 +486,7 @@ share/qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h @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++-maemo @dirrm share/qt4/mkspecs/linux-g++-64 @dirrm share/qt4/mkspecs/linux-g++-32 @dirrm share/qt4/mkspecs/linux-g++ @@ -424,10 +511,14 @@ share/qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h @dirrm share/qt4/mkspecs/freebsd-g++ @dirrm share/qt4/mkspecs/features/win32 @dirrm share/qt4/mkspecs/features/unix +@dirrm share/qt4/mkspecs/features/symbian @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/wince +@dirrm share/qt4/mkspecs/common/symbian/stl-off +@dirrm share/qt4/mkspecs/common/symbian @dirrm share/qt4/mkspecs/common @dirrm share/qt4/mkspecs/aix-xlc-64 @dirrm share/qt4/mkspecs/aix-xlc diff --git a/devel/qt4-assistant-adp/Makefile b/devel/qt4-assistant-adp/Makefile index 332e4bdfe561..f9fe3e889a97 100644 --- a/devel/qt4-assistant-adp/Makefile +++ b/devel/qt4-assistant-adp/Makefile @@ -9,7 +9,7 @@ PORTNAME= assistant PORTVERSION= ${QT4_VERSION} CATEGORIES?= devel PKGNAMEPREFIX= qt4- -PKGNAMESUFFIX= -adp +PKGNAMESUFFIX= -adp MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation browser, adp compat version @@ -29,25 +29,28 @@ MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ - 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/activeqt src/multimedia src/opengl src/openvg src/phonon \ + src/qt3support src/s60installs src/s60main src/script \ + src/scripttools src/sql src/svg src/testlib src/tools \ + src/winmain src/xmlpatterns src/3rdparty/clucene \ + src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ + src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ + src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC=${WRKDIR}/${DISTNAME}/tools/${PORTNAME}/compat -CONFIGURE_WRKSRC=${WRKSRC}/../../../ -PATCH_WRKSRC=${CONFIGURE_WRKSRC} +BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME}/compat +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-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 - ${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/../../../bin/uic - ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../../bin/rcc + ${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/uic-qt4 ${WRKSRC}/bin/uic + ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc .include <bsd.port.mk> diff --git a/devel/qt4-assistant-adp/pkg-descr b/devel/qt4-assistant-adp/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/devel/qt4-assistant-adp/pkg-descr +++ b/devel/qt4-assistant-adp/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile index 5d86a782616e..15a108183fb0 100644 --- a/devel/qt4-assistant/Makefile +++ b/devel/qt4-assistant/Makefile @@ -8,7 +8,6 @@ PORTNAME= assistant PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -30,28 +29,30 @@ 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/qt3support src/script src/svg src/testlib \ - src/tools src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs + src/activeqt src/dbus src/multimedia src/opengl src/openvg \ + src/phonon src/qt3support src/s60installs src/s60main \ + src/script src/scripttools src/svg src/testlib src/tools \ + src/winmain src/xml src/xmlpatterns src/3rdparty/clucene \ + src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ + src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC=${WRKDIR}/${DISTNAME}/tools/${PORTNAME}/tools/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../../../ -PATCH_WRKSRC=${CONFIGURE_WRKSRC} +BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME}/tools/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} \ -e 's|^TARGET.*|TARGET=assistant-qt4|g' \ - ${WRKSRC}/${PORTNAME}.pro - ${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/uic-qt4 ${WRKSRC}/../../../../bin/uic - ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../../../bin/rcc + ${BUILD_WRKSRC}/${PORTNAME}.pro + ${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/uic-qt4 ${WRKSRC}/bin/uic + ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc .include <bsd.port.mk> diff --git a/devel/qt4-assistant/pkg-descr b/devel/qt4-assistant/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/devel/qt4-assistant/pkg-descr +++ b/devel/qt4-assistant/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile index dc8b22d682e9..b948a98fda87 100644 --- a/devel/qt4-corelib/Makefile +++ b/devel/qt4-corelib/Makefile @@ -8,7 +8,6 @@ PORTNAME= corelib PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -26,27 +25,28 @@ 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/gui src/network src/opengl src/phonon \ - src/qt3support src/script src/sql src/svg src/testlib \ - src/tools src/xml src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/gui src/multimedia src/network \ + src/opengl src/openvg src/phonon src/qt3support \ + src/s60installs src/s60main src/script src/scripttools src/sql \ + src/svg src/testlib src/tools src/winmain src/xml \ + src/xmlpatterns src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../ -PATCH_WRKSRC=${CONFIGURE_WRKSRC} +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES=${.CURDIR}/../../devel/qt4/files/extrapatch-configure +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure .include "${.CURDIR}/../../devel/qt4/files/Makefile.options" @@ -54,24 +54,24 @@ pre-everything:: @${CAT} ${PKGMESSAGE} post-patch: - ${REINPLACE_CMD} -e '${QT4_OPTIONS_REPLACE}' ${CONFIGURE_WRKSRC}/configure + ${REINPLACE_CMD} -e '${QT4_OPTIONS_REPLACE}' ${WRKSRC}/configure pre-configure: - ${MKDIR} ${WRKSRC}/../../mkspecs - ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake - ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc + ${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 + -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' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ - ${WRKSRC}/../../lib/pkgconfig/QtCore.pc + ${WRKSRC}/lib/pkgconfig/QtCore.pc 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/ + ${INSTALL_DATA} ${WRKSRC}/mkspecs/qconfig.pri ${PREFIX}/share/qt4/mkspecs/ .include <bsd.port.mk> diff --git a/devel/qt4-corelib/files/patch-0185-fix-format-strings.diff b/devel/qt4-corelib/files/patch-0185-fix-format-strings.diff index 929cc090f089..8ca41479b1dd 100644 --- a/devel/qt4-corelib/files/patch-0185-fix-format-strings.diff +++ b/devel/qt4-corelib/files/patch-0185-fix-format-strings.diff @@ -1,6 +1,6 @@ ---- src/corelib/global/qglobal.h -+++ src/corelib/global/qglobal.h -@@ -1266,8 +1266,16 @@ Q_CORE_EXPORT void qFatal(const char *, +--- src/corelib/global/qglobal.h.orig 2009-09-07 13:00:30.000000000 +0200 ++++ src/corelib/global/qglobal.h 2009-09-14 12:46:30.965296640 +0200 +@@ -1594,8 +1594,16 @@ #ifdef QT3_SUPPORT Q_CORE_EXPORT QT3_SUPPORT void qSystemWarning(const char *msg, int code = -1); #endif /* QT3_SUPPORT */ @@ -19,9 +19,9 @@ #if (defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_TEXTSTREAM)) && !defined(QT_NO_DEBUG_STREAM) #define QT_NO_DEBUG_STREAM ---- src/corelib/tools/qbytearray.h -+++ src/corelib/tools/qbytearray.h -@@ -71,8 +71,16 @@ Q_CORE_EXPORT int qstricmp(const char *, +--- src/corelib/tools/qbytearray.h.orig 2009-09-07 13:00:30.000000000 +0200 ++++ src/corelib/tools/qbytearray.h 2009-09-14 12:44:29.801547129 +0200 +@@ -95,8 +95,16 @@ Q_CORE_EXPORT int qstrnicmp(const char *, const char *, uint len); // implemented in qvsnprintf.cpp @@ -39,4 +39,4 @@ + ; #ifdef QT3_SUPPORT - inline QT3_SUPPORT void *qmemmove(void *dst, const void *src, uint len)
\ No newline at end of file + inline QT3_SUPPORT void *qmemmove(void *dst, const void *src, uint len) diff --git a/devel/qt4-corelib/files/patch-configure b/devel/qt4-corelib/files/patch-configure new file mode 100644 index 000000000000..78e61e71ec52 --- /dev/null +++ b/devel/qt4-corelib/files/patch-configure @@ -0,0 +1,75 @@ +--- configure.orig 2009-09-21 14:25:12.859259834 +0200 ++++ configure 2009-09-21 14:47:16.335016833 +0200 +@@ -5886,7 +5886,6 @@ + QT_CONFIG="$QT_CONFIG phonon-backend" + fi + else +- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_PHONON" + fi + + # disable accessibility +@@ -5925,7 +5924,6 @@ + + # enable opengl + if [ "$CFG_OPENGL" = "no" ]; then +- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENGL" + else + QT_CONFIG="$QT_CONFIG opengl" + fi +@@ -6355,7 +6353,6 @@ + if [ "$CFG_XMLPATTERNS" = "yes" ]; then + QT_CONFIG="$QT_CONFIG xmlpatterns" + else +- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XMLPATTERNS" + fi + + if [ "$CFG_MULTIMEDIA" = "no" ]; then +@@ -6864,10 +6861,8 @@ + [ "$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_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" +@@ -6876,34 +6871,21 @@ + 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" ++%%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_XSYNC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XSYNC" +-[ "$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" diff --git a/devel/qt4-corelib/pkg-descr b/devel/qt4-corelib/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/devel/qt4-corelib/pkg-descr +++ b/devel/qt4-corelib/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4-corelib/pkg-plist b/devel/qt4-corelib/pkg-plist index e3da1a095c91..8cbeffe02d9c 100644 --- a/devel/qt4-corelib/pkg-plist +++ b/devel/qt4-corelib/pkg-plist @@ -1,8 +1,12 @@ include/qt4/Qt/QtCore +include/qt4/Qt/qabstractanimation.h include/qt4/Qt/qabstracteventdispatcher.h include/qt4/Qt/qabstractfileengine.h include/qt4/Qt/qabstractitemmodel.h +include/qt4/Qt/qabstractstate.h +include/qt4/Qt/qabstracttransition.h include/qt4/Qt/qalgorithms.h +include/qt4/Qt/qanimationgroup.h include/qt4/Qt/qatomic.h include/qt4/Qt/qatomic_alpha.h include/qt4/Qt/qatomic_arch.h @@ -14,6 +18,7 @@ include/qt4/Qt/qatomic_bootstrap.h include/qt4/Qt/qatomic_generic.h include/qt4/Qt/qatomic_i386.h include/qt4/Qt/qatomic_ia64.h +include/qt4/Qt/qatomic_macosx.h include/qt4/Qt/qatomic_mips.h include/qt4/Qt/qatomic_parisc.h include/qt4/Qt/qatomic_powerpc.h @@ -21,6 +26,10 @@ 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_symbian.h +include/qt4/Qt/qatomic_vxworks.h +include/qt4/Qt/qatomic_windows.h +include/qt4/Qt/qatomic_windowsce.h include/qt4/Qt/qatomic_x86_64.h include/qt4/Qt/qbasicatomic.h include/qt4/Qt/qbasictimer.h @@ -37,6 +46,7 @@ include/qt4/Qt/qconfig-minimal.h include/qt4/Qt/qconfig-small.h include/qt4/Qt/qconfig.h include/qt4/Qt/qcontainerfwd.h +include/qt4/Qt/qcontiguouscache.h include/qt4/Qt/qcoreapplication.h include/qt4/Qt/qcoreevent.h include/qt4/Qt/qcryptographichash.h @@ -45,20 +55,26 @@ include/qt4/Qt/qdatetime.h include/qt4/Qt/qdebug.h include/qt4/Qt/qdir.h include/qt4/Qt/qdiriterator.h +include/qt4/Qt/qeasingcurve.h include/qt4/Qt/qendian.h include/qt4/Qt/qeventloop.h +include/qt4/Qt/qeventtransition.h include/qt4/Qt/qfactoryinterface.h include/qt4/Qt/qfeatures.h include/qt4/Qt/qfile.h include/qt4/Qt/qfileinfo.h include/qt4/Qt/qfilesystemwatcher.h +include/qt4/Qt/qfinalstate.h include/qt4/Qt/qfsfileengine.h +include/qt4/Qt/qfunctions_vxworks.h +include/qt4/Qt/qfunctions_wince.h include/qt4/Qt/qfuture.h include/qt4/Qt/qfutureinterface.h include/qt4/Qt/qfuturesynchronizer.h include/qt4/Qt/qfuturewatcher.h include/qt4/Qt/qglobal.h include/qt4/Qt/qhash.h +include/qt4/Qt/qhistorystate.h include/qt4/Qt/qiodevice.h include/qt4/Qt/qiterator.h include/qt4/Qt/qlibrary.h @@ -68,6 +84,7 @@ include/qt4/Qt/qlinkedlist.h include/qt4/Qt/qlist.h include/qt4/Qt/qlocale.h include/qt4/Qt/qmap.h +include/qt4/Qt/qmargins.h include/qt4/Qt/qmath.h include/qt4/Qt/qmetaobject.h include/qt4/Qt/qmetatype.h @@ -79,18 +96,23 @@ include/qt4/Qt/qobject.h include/qt4/Qt/qobjectcleanuphandler.h include/qt4/Qt/qobjectdefs.h include/qt4/Qt/qpair.h +include/qt4/Qt/qparallelanimationgroup.h +include/qt4/Qt/qpauseanimation.h include/qt4/Qt/qplugin.h include/qt4/Qt/qpluginloader.h include/qt4/Qt/qpoint.h include/qt4/Qt/qpointer.h include/qt4/Qt/qprocess.h +include/qt4/Qt/qpropertyanimation.h include/qt4/Qt/qqueue.h include/qt4/Qt/qreadwritelock.h include/qt4/Qt/qrect.h include/qt4/Qt/qregexp.h include/qt4/Qt/qresource.h include/qt4/Qt/qrunnable.h +include/qt4/Qt/qscopedpointer.h include/qt4/Qt/qsemaphore.h +include/qt4/Qt/qsequentialanimationgroup.h include/qt4/Qt/qset.h include/qt4/Qt/qsettings.h include/qt4/Qt/qshareddata.h @@ -98,13 +120,18 @@ include/qt4/Qt/qsharedmemory.h include/qt4/Qt/qsharedpointer.h include/qt4/Qt/qsharedpointer_impl.h include/qt4/Qt/qsignalmapper.h +include/qt4/Qt/qsignaltransition.h include/qt4/Qt/qsize.h include/qt4/Qt/qsocketnotifier.h include/qt4/Qt/qstack.h +include/qt4/Qt/qstate.h +include/qt4/Qt/qstatemachine.h include/qt4/Qt/qstring.h +include/qt4/Qt/qstringbuilder.h include/qt4/Qt/qstringlist.h include/qt4/Qt/qstringmatcher.h include/qt4/Qt/qsystemsemaphore.h +include/qt4/Qt/qt_windows.h include/qt4/Qt/qtconcurrentcompilertest.h include/qt4/Qt/qtconcurrentexception.h include/qt4/Qt/qtconcurrentfilter.h @@ -134,17 +161,23 @@ include/qt4/Qt/qtranslator.h include/qt4/Qt/qurl.h include/qt4/Qt/quuid.h include/qt4/Qt/qvariant.h +include/qt4/Qt/qvariantanimation.h include/qt4/Qt/qvarlengtharray.h include/qt4/Qt/qvector.h include/qt4/Qt/qwaitcondition.h include/qt4/Qt/qxmlstream.h +include/qt4/QtCore/QAbstractAnimation +include/qt4/QtCore/QAbstractConcatenable include/qt4/QtCore/QAbstractEventDispatcher include/qt4/QtCore/QAbstractFileEngine include/qt4/QtCore/QAbstractFileEngineHandler include/qt4/QtCore/QAbstractFileEngineIterator include/qt4/QtCore/QAbstractItemModel include/qt4/QtCore/QAbstractListModel +include/qt4/QtCore/QAbstractState include/qt4/QtCore/QAbstractTableModel +include/qt4/QtCore/QAbstractTransition +include/qt4/QtCore/QAnimationGroup include/qt4/QtCore/QArgument include/qt4/QtCore/QAtomicInt include/qt4/QtCore/QAtomicPointer @@ -163,7 +196,11 @@ include/qt4/QtCore/QCache include/qt4/QtCore/QChar include/qt4/QtCore/QCharRef include/qt4/QtCore/QChildEvent +include/qt4/QtCore/QConcatenable include/qt4/QtCore/QConstString +include/qt4/QtCore/QContiguousCache +include/qt4/QtCore/QContiguousCacheData +include/qt4/QtCore/QContiguousCacheTypedData include/qt4/QtCore/QCoreApplication include/qt4/QtCore/QCryptographicHash include/qt4/QtCore/QCustomEvent @@ -174,8 +211,10 @@ include/qt4/QtCore/QDebug include/qt4/QtCore/QDir include/qt4/QtCore/QDirIterator include/qt4/QtCore/QDynamicPropertyChangeEvent +include/qt4/QtCore/QEasingCurve include/qt4/QtCore/QEvent include/qt4/QtCore/QEventLoop +include/qt4/QtCore/QEventTransition include/qt4/QtCore/QExplicitlySharedDataPointer include/qt4/QtCore/QFSFileEngine include/qt4/QtCore/QFactoryInterface @@ -184,6 +223,7 @@ include/qt4/QtCore/QFileInfo include/qt4/QtCore/QFileInfoList include/qt4/QtCore/QFileInfoListIterator include/qt4/QtCore/QFileSystemWatcher +include/qt4/QtCore/QFinalState include/qt4/QtCore/QFlag include/qt4/QtCore/QFlags include/qt4/QtCore/QForeachContainer @@ -205,12 +245,13 @@ include/qt4/QtCore/QHashDummyNode include/qt4/QtCore/QHashDummyValue include/qt4/QtCore/QHashIterator include/qt4/QtCore/QHashNode +include/qt4/QtCore/QHistoryState include/qt4/QtCore/QIODevice include/qt4/QtCore/QIncompatibleFlag -include/qt4/QtCore/QIntForSize -include/qt4/QtCore/QIntForType +include/qt4/QtCore/QIntegerForSize include/qt4/QtCore/QInternal include/qt4/QtCore/QLatin1Char +include/qt4/QtCore/QLatin1Literal include/qt4/QtCore/QLatin1String include/qt4/QtCore/QLibrary include/qt4/QtCore/QLibraryInfo @@ -229,10 +270,12 @@ include/qt4/QtCore/QMapData include/qt4/QtCore/QMapIterator include/qt4/QtCore/QMapNode include/qt4/QtCore/QMapPayloadNode +include/qt4/QtCore/QMargins include/qt4/QtCore/QMetaClassInfo include/qt4/QtCore/QMetaEnum include/qt4/QtCore/QMetaMethod include/qt4/QtCore/QMetaObject +include/qt4/QtCore/QMetaObjectAccessor include/qt4/QtCore/QMetaObjectExtraData include/qt4/QtCore/QMetaProperty include/qt4/QtCore/QMetaType @@ -261,12 +304,16 @@ include/qt4/QtCore/QObjectData include/qt4/QtCore/QObjectList include/qt4/QtCore/QObjectUserData include/qt4/QtCore/QPair +include/qt4/QtCore/QParallelAnimationGroup +include/qt4/QtCore/QPauseAnimation include/qt4/QtCore/QPersistentModelIndex include/qt4/QtCore/QPluginLoader include/qt4/QtCore/QPoint include/qt4/QtCore/QPointF include/qt4/QtCore/QPointer include/qt4/QtCore/QProcess +include/qt4/QtCore/QProcessEnvironment +include/qt4/QtCore/QPropertyAnimation include/qt4/QtCore/QQueue include/qt4/QtCore/QReadLocker include/qt4/QtCore/QReadWriteLock @@ -276,7 +323,13 @@ include/qt4/QtCore/QRegExp include/qt4/QtCore/QResource include/qt4/QtCore/QReturnArgument include/qt4/QtCore/QRunnable +include/qt4/QtCore/QScopedArrayPointer +include/qt4/QtCore/QScopedPointer +include/qt4/QtCore/QScopedPointerArrayDeleter +include/qt4/QtCore/QScopedPointerDeleter +include/qt4/QtCore/QScopedPointerPodDeleter include/qt4/QtCore/QSemaphore +include/qt4/QtCore/QSequentialAnimationGroup include/qt4/QtCore/QSet include/qt4/QtCore/QSetIterator include/qt4/QtCore/QSettings @@ -285,12 +338,16 @@ include/qt4/QtCore/QSharedDataPointer include/qt4/QtCore/QSharedMemory include/qt4/QtCore/QSharedPointer include/qt4/QtCore/QSignalMapper +include/qt4/QtCore/QSignalTransition include/qt4/QtCore/QSize include/qt4/QtCore/QSizeF include/qt4/QtCore/QSocketNotifier include/qt4/QtCore/QStack +include/qt4/QtCore/QState +include/qt4/QtCore/QStateMachine include/qt4/QtCore/QStdWString include/qt4/QtCore/QString +include/qt4/QtCore/QStringBuilder include/qt4/QtCore/QStringList include/qt4/QtCore/QStringListIterator include/qt4/QtCore/QStringMatcher @@ -321,12 +378,11 @@ include/qt4/QtCore/QTimer include/qt4/QtCore/QTimerEvent include/qt4/QtCore/QTranslator include/qt4/QtCore/QTypeInfo -include/qt4/QtCore/QUintForSize -include/qt4/QtCore/QUintForType include/qt4/QtCore/QUrl include/qt4/QtCore/QUuid include/qt4/QtCore/QVarLengthArray include/qt4/QtCore/QVariant +include/qt4/QtCore/QVariantAnimation include/qt4/QtCore/QVariantComparisonHelper include/qt4/QtCore/QVariantHash include/qt4/QtCore/QVariantList @@ -377,10 +433,14 @@ include/qt4/QtCore/QtGlobal include/qt4/QtCore/QtMsgHandler include/qt4/QtCore/QtPlugin include/qt4/QtCore/QtPluginInstanceFunction +include/qt4/QtCore/qabstractanimation.h include/qt4/QtCore/qabstracteventdispatcher.h include/qt4/QtCore/qabstractfileengine.h include/qt4/QtCore/qabstractitemmodel.h +include/qt4/QtCore/qabstractstate.h +include/qt4/QtCore/qabstracttransition.h include/qt4/QtCore/qalgorithms.h +include/qt4/QtCore/qanimationgroup.h include/qt4/QtCore/qatomic.h include/qt4/QtCore/qatomic_alpha.h include/qt4/QtCore/qatomic_arch.h @@ -392,6 +452,7 @@ include/qt4/QtCore/qatomic_bootstrap.h include/qt4/QtCore/qatomic_generic.h include/qt4/QtCore/qatomic_i386.h include/qt4/QtCore/qatomic_ia64.h +include/qt4/QtCore/qatomic_macosx.h include/qt4/QtCore/qatomic_mips.h include/qt4/QtCore/qatomic_parisc.h include/qt4/QtCore/qatomic_powerpc.h @@ -399,6 +460,10 @@ 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_symbian.h +include/qt4/QtCore/qatomic_vxworks.h +include/qt4/QtCore/qatomic_windows.h +include/qt4/QtCore/qatomic_windowsce.h include/qt4/QtCore/qatomic_x86_64.h include/qt4/QtCore/qbasicatomic.h include/qt4/QtCore/qbasictimer.h @@ -415,6 +480,7 @@ include/qt4/QtCore/qconfig-minimal.h include/qt4/QtCore/qconfig-small.h include/qt4/QtCore/qconfig.h include/qt4/QtCore/qcontainerfwd.h +include/qt4/QtCore/qcontiguouscache.h include/qt4/QtCore/qcoreapplication.h include/qt4/QtCore/qcoreevent.h include/qt4/QtCore/qcryptographichash.h @@ -423,20 +489,26 @@ include/qt4/QtCore/qdatetime.h include/qt4/QtCore/qdebug.h include/qt4/QtCore/qdir.h include/qt4/QtCore/qdiriterator.h +include/qt4/QtCore/qeasingcurve.h include/qt4/QtCore/qendian.h include/qt4/QtCore/qeventloop.h +include/qt4/QtCore/qeventtransition.h include/qt4/QtCore/qfactoryinterface.h include/qt4/QtCore/qfeatures.h include/qt4/QtCore/qfile.h include/qt4/QtCore/qfileinfo.h include/qt4/QtCore/qfilesystemwatcher.h +include/qt4/QtCore/qfinalstate.h include/qt4/QtCore/qfsfileengine.h +include/qt4/QtCore/qfunctions_vxworks.h +include/qt4/QtCore/qfunctions_wince.h include/qt4/QtCore/qfuture.h include/qt4/QtCore/qfutureinterface.h include/qt4/QtCore/qfuturesynchronizer.h include/qt4/QtCore/qfuturewatcher.h include/qt4/QtCore/qglobal.h include/qt4/QtCore/qhash.h +include/qt4/QtCore/qhistorystate.h include/qt4/QtCore/qiodevice.h include/qt4/QtCore/qiterator.h include/qt4/QtCore/qlibrary.h @@ -446,6 +518,7 @@ include/qt4/QtCore/qlinkedlist.h include/qt4/QtCore/qlist.h include/qt4/QtCore/qlocale.h include/qt4/QtCore/qmap.h +include/qt4/QtCore/qmargins.h include/qt4/QtCore/qmath.h include/qt4/QtCore/qmetaobject.h include/qt4/QtCore/qmetatype.h @@ -457,18 +530,23 @@ include/qt4/QtCore/qobject.h include/qt4/QtCore/qobjectcleanuphandler.h include/qt4/QtCore/qobjectdefs.h include/qt4/QtCore/qpair.h +include/qt4/QtCore/qparallelanimationgroup.h +include/qt4/QtCore/qpauseanimation.h include/qt4/QtCore/qplugin.h include/qt4/QtCore/qpluginloader.h include/qt4/QtCore/qpoint.h include/qt4/QtCore/qpointer.h include/qt4/QtCore/qprocess.h +include/qt4/QtCore/qpropertyanimation.h include/qt4/QtCore/qqueue.h include/qt4/QtCore/qreadwritelock.h include/qt4/QtCore/qrect.h include/qt4/QtCore/qregexp.h include/qt4/QtCore/qresource.h include/qt4/QtCore/qrunnable.h +include/qt4/QtCore/qscopedpointer.h include/qt4/QtCore/qsemaphore.h +include/qt4/QtCore/qsequentialanimationgroup.h include/qt4/QtCore/qset.h include/qt4/QtCore/qsettings.h include/qt4/QtCore/qshareddata.h @@ -476,13 +554,18 @@ include/qt4/QtCore/qsharedmemory.h include/qt4/QtCore/qsharedpointer.h include/qt4/QtCore/qsharedpointer_impl.h include/qt4/QtCore/qsignalmapper.h +include/qt4/QtCore/qsignaltransition.h include/qt4/QtCore/qsize.h include/qt4/QtCore/qsocketnotifier.h include/qt4/QtCore/qstack.h +include/qt4/QtCore/qstate.h +include/qt4/QtCore/qstatemachine.h include/qt4/QtCore/qstring.h +include/qt4/QtCore/qstringbuilder.h include/qt4/QtCore/qstringlist.h include/qt4/QtCore/qstringmatcher.h include/qt4/QtCore/qsystemsemaphore.h +include/qt4/QtCore/qt_windows.h include/qt4/QtCore/qtconcurrentcompilertest.h include/qt4/QtCore/qtconcurrentexception.h include/qt4/QtCore/qtconcurrentfilter.h @@ -512,6 +595,7 @@ include/qt4/QtCore/qtranslator.h include/qt4/QtCore/qurl.h include/qt4/QtCore/quuid.h include/qt4/QtCore/qvariant.h +include/qt4/QtCore/qvariantanimation.h include/qt4/QtCore/qvarlengtharray.h include/qt4/QtCore/qvector.h include/qt4/QtCore/qwaitcondition.h @@ -523,12 +607,12 @@ lib/qt4/libQtCore.so.4 lib/qt4/libQtCore.so.%%SHLIB_SHVER%% lib/qt4/libQtCore.so.%%SHLIB_VER%% %%DEBUG%%lib/qt4/libQtCore.so.%%SHLIB_VER%%.debug -lib/qt4/plugins/.keep_me +%%QT_PLUGINDIR_REL%%/.keep_me libdata/pkgconfig/QtCore.pc share/qt4/mkspecs/qconfig.pri @dirrmtry share/qt4/mkspecs @dirrmtry share/qt4 -@dirrm lib/qt4/plugins +@dirrmtry %%QT_PLUGINDIR_REL%% @dirrmtry lib/qt4 @dirrm include/qt4/QtCore @dirrmtry include/qt4/Qt diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile index 3dfe8ec9f152..3dd7e55f2c3e 100644 --- a/devel/qt4-designer/Makefile +++ b/devel/qt4-designer/Makefile @@ -8,7 +8,6 @@ PORTNAME= designer PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -23,6 +22,8 @@ QT_DIST= yes MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes +#Try to fix linking when previous version is installed +CONFIGURE_ARGS+= -L${WRKSRC}/lib USE_LDCONFIG= ${PREFIX}/lib/qt4 ALL_TARGET= first @@ -30,42 +31,43 @@ 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/sql src/svg src/testlib \ - src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs + src/activeqt src/dbus src/multimedia src/opengl src/openvg \ + src/s60installs src/s60main src/scripttools src/sql src/svg \ + src/testlib src/winmain src/xmlpatterns src/3rdparty/clucene \ + src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ + src/3rdparty/libpng src/3rdparty/libtiff EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../ -PATCH_WRKSRC=${CONFIGURE_WRKSRC} +BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=designer-qt4|g' \ - ${WRKSRC}/src/designer/${PORTNAME}.pro + ${BUILD_WRKSRC}/src/${PORTNAME}/${PORTNAME}.pro # fix build when previous version is installed ${REINPLACE_CMD} -e '/^CONFIG/s|depend_prl||' \ - ${WRKSRC}/src/components/lib/lib.pro - ${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/uic-qt4 ${WRKSRC}/../../bin/uic - ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc + ${BUILD_WRKSRC}/src/components/lib/lib.pro + ${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/uic-qt4 ${WRKSRC}/bin/uic + ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc pre-install: ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -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/QtUiTools.pc \ - ${WRKSRC}/../../lib/pkgconfig/QtDesigner.pc \ - ${WRKSRC}/../../lib/pkgconfig/QtDesignerComponents.pc + ${WRKSRC}/lib/pkgconfig/QtUiTools.pc \ + ${WRKSRC}/lib/pkgconfig/QtDesigner.pc \ + ${WRKSRC}/lib/pkgconfig/QtDesignerComponents.pc ${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ - ${WRKSRC}/src/lib/Makefile \ - ${WRKSRC}/src/uitools/Makefile \ - ${WRKSRC}/src/components/lib/Makefile + ${BUILD_WRKSRC}/src/lib/Makefile \ + ${BUILD_WRKSRC}/src/uitools/Makefile \ + ${BUILD_WRKSRC}/src/components/lib/Makefile .include <bsd.port.mk> diff --git a/devel/qt4-designer/pkg-descr b/devel/qt4-designer/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/devel/qt4-designer/pkg-descr +++ b/devel/qt4-designer/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4-designer/pkg-plist b/devel/qt4-designer/pkg-plist index 43d99f49c582..21d0f2aeb1d3 100644 --- a/devel/qt4-designer/pkg-plist +++ b/devel/qt4-designer/pkg-plist @@ -96,14 +96,18 @@ lib/qt4/libQtDesignerComponents.so.%%SHLIB_VER%% %%DEBUG%%lib/qt4/libQtDesignerComponents.so.%%SHLIB_VER%%.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 -%%DEBUG%%lib/qt4/plugins/designer/libqwebview.so.debug +%%QT_PLUGINDIR_REL%%/designer/libphononwidgets.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libphononwidgets.so.debug +%%QT_PLUGINDIR_REL%%/designer/libqt3supportwidgets.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libqt3supportwidgets.so.debug +%%QT_PLUGINDIR_REL%%/designer/libqwebview.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libqwebview.so.debug libdata/pkgconfig/QtUiTools.pc libdata/pkgconfig/QtDesigner.pc libdata/pkgconfig/QtDesignerComponents.pc -@dirrmtry lib/qt4/plugins/designer +@dirrmtry %%QT_PLUGINDIR_REL%%/designer +@dirrmtry %%QT_PLUGINDIR_REL%% +@dirrmtry lib/qt4 @dirrm include/qt4/QtUiTools @dirrm include/qt4/QtDesigner +@dirrmtry include/qt4 diff --git a/devel/qt4-help-tools/Makefile b/devel/qt4-help-tools/Makefile index 974cf050328d..dc9beaccfa69 100644 --- a/devel/qt4-help-tools/Makefile +++ b/devel/qt4-help-tools/Makefile @@ -30,27 +30,30 @@ 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/network 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/activeqt src/dbus src/multimedia src/network src/opengl \ + src/openvg src/phonon src/qt3support src/s60installs \ + src/s60main src/script src/scripttools src/sql src/svg \ + src/testlib src/tools src/winmain src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC=${WRKDIR}/${DISTNAME}/tools/assistant/tools -CONFIGURE_WRKSRC=${WRKSRC}/../../../ -PATCH_WRKSRC=${CONFIGURE_WRKSRC} +BUILD_WRKSRC= ${WRKSRC}/tools/assistant/tools +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|assistant||' \ - ${WRKSRC}/tools.pro - ${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/uic-qt4 ${WRKSRC}/../../../bin/uic - ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../../bin/rcc + ${BUILD_WRKSRC}/tools.pro + ${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/uic-qt4 ${WRKSRC}/bin/uic + ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc .include <bsd.port.mk> diff --git a/devel/qt4-help-tools/pkg-descr b/devel/qt4-help-tools/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/devel/qt4-help-tools/pkg-descr +++ b/devel/qt4-help-tools/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4-help/Makefile b/devel/qt4-help/Makefile index 5434bdec1aab..ce0f55d9d9f3 100644 --- a/devel/qt4-help/Makefile +++ b/devel/qt4-help/Makefile @@ -14,13 +14,12 @@ MAINTAINER= kde@FreeBSD.org COMMENT= QtHelp module provides QHelpEngine API and is used by Assistant USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build rcc_build corelib clucene gui sql xml network +QT_COMPONENTS= qmake_build moc_build rcc_build corelib clucene \ + gui sql sql-sqlite3_run 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 - HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/qt4 @@ -30,33 +29,37 @@ 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/qt3support src/script src/svg src/testlib \ - src/tools src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/multimedia src/opengl src/openvg \ + src/phonon src/qt3support src/s60installs src/s60main \ + src/script src/scripttools src/svg src/testlib src/tools \ + src/winmain src/xmlpatterns src/3rdparty/clucene \ + src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ + src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ + src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/tools/assistant/lib -CONFIGURE_WRKSRC=${WRKSRC}/../../../ +BUILD_WRKSRC= ${WRKSRC}/tools/assistant/lib +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-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 - ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../../bin/rcc + ${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' \ - ${WRKSRC}/Makefile + ${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' \ -E -e 's|(.*location=).*rcc|\1${PREFIX}/bin/rcc|g' \ - ${WRKSRC}/../../../lib/pkgconfig/QtHelp.pc + ${WRKSRC}/lib/pkgconfig/QtHelp.pc .include <bsd.port.mk> diff --git a/devel/qt4-help/pkg-descr b/devel/qt4-help/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/devel/qt4-help/pkg-descr +++ b/devel/qt4-help/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4-help/pkg-plist b/devel/qt4-help/pkg-plist index 99d0afd3e555..b5e9bef36ef3 100644 --- a/devel/qt4-help/pkg-plist +++ b/devel/qt4-help/pkg-plist @@ -36,6 +36,7 @@ lib/qt4/libQtHelp.so.%%SHLIB_SHVER%% lib/qt4/libQtHelp.so.%%SHLIB_VER%% %%DEBUG%%lib/qt4/libQtHelp.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtHelp.pc +@dirrmtry lib/qt4 @dirrm include/qt4/QtHelp @dirrmtry include/qt4/Qt @dirrmtry include/qt4 diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile index 1bfa3ba92915..23c7e069f0d3 100644 --- a/devel/qt4-libqtassistantclient/Makefile +++ b/devel/qt4-libqtassistantclient/Makefile @@ -8,7 +8,6 @@ PORTNAME= libQtAssistantClient PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -22,39 +21,43 @@ QT_DIST= yes MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes -USE_LDCONFIG= 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 translations \ - src/dbus src/opengl src/phonon \ - src/qt3support src/script src/sql src/svg src/testlib \ - src/tools src/xml src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/gui src/multimedia src/opengl \ + src/openvg src/phonon src/qt3support src/s60installs \ + src/s60main src/script src/scripttools src/sql src/svg \ + src/testlib src/tools src/winmain src/xml src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/tools/assistant/compat/lib -CONFIGURE_WRKSRC=${WRKSRC}/../../../../ +BUILD_WRKSRC= ${WRKSRC}/tools/assistant/compat/lib +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -E -e 's|"(.*)assistant"|"\1assistant-qt4"|g' \ - ${WRKSRC}/qassistantclient.cpp - ${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 + ${BUILD_WRKSRC}/qassistantclient.cpp + ${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' ${WRKSRC}/Makefile + -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/QtAssistantClient.pc + ${WRKSRC}/lib/pkgconfig/QtAssistantClient.pc .include <bsd.port.mk> diff --git a/devel/qt4-libqtassistantclient/pkg-descr b/devel/qt4-libqtassistantclient/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/devel/qt4-libqtassistantclient/pkg-descr +++ b/devel/qt4-libqtassistantclient/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4-libqtassistantclient/pkg-plist b/devel/qt4-libqtassistantclient/pkg-plist index d3a0fad7bdeb..aa018988c3d6 100644 --- a/devel/qt4-libqtassistantclient/pkg-plist +++ b/devel/qt4-libqtassistantclient/pkg-plist @@ -9,4 +9,6 @@ lib/qt4/libQtAssistantClient.so.%%SHLIB_SHVER%% lib/qt4/libQtAssistantClient.so.%%SHLIB_VER%% %%DEBUG%%lib/qt4/libQtAssistantClient.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtAssistantClient.pc +@dirrmtry lib/qt4 @dirrm include/qt4/QtAssistant +@dirrmtry include/qt4 diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile index 4a8836df4519..da647b6fb122 100644 --- a/devel/qt4-linguist/Makefile +++ b/devel/qt4-linguist/Makefile @@ -8,7 +8,6 @@ PORTNAME= linguist PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -29,29 +28,32 @@ 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 \ - src/dbus 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 +DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ + src/activeqt src/dbus src/multimedia src/network src/opengl \ + src/openvg src/phonon src/qt3support src/s60installs \ + src/s60main src/script src/scripttools src/sql src/svg \ + src/testlib src/tools src/winmain src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../ -PATCH_WRKSRC=${CONFIGURE_WRKSRC} +BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -E -e 's|^TARGET[[:blank:]]*=[[:blank:]]*([a-z]+)|TARGET=\1-qt4|g' \ - ${WRKSRC}/${PORTNAME}.pro ${WRKSRC}/${PORTNAME}/${PORTNAME}.pro \ - ${WRKSRC}/lrelease/lrelease.pro ${WRKSRC}/lupdate/lupdate.pro - ${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/uic-qt4 ${WRKSRC}/../../bin/uic - ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc + ${BUILD_WRKSRC}/${PORTNAME}.pro ${BUILD_WRKSRC}/${PORTNAME}/${PORTNAME}.pro \ + ${BUILD_WRKSRC}/lrelease/lrelease.pro ${BUILD_WRKSRC}/lupdate/lupdate.pro + ${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/uic-qt4 ${WRKSRC}/bin/uic + ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc .include <bsd.port.mk> diff --git a/devel/qt4-linguist/pkg-descr b/devel/qt4-linguist/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/devel/qt4-linguist/pkg-descr +++ b/devel/qt4-linguist/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4-makeqpf/Makefile b/devel/qt4-makeqpf/Makefile index 71cb3b551999..de50dc7462ee 100644 --- a/devel/qt4-makeqpf/Makefile +++ b/devel/qt4-makeqpf/Makefile @@ -8,7 +8,6 @@ PORTNAME= makeqpf PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -29,26 +28,30 @@ 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/network src/opengl src/phonon \ - src/qt3support src/script src/sql src/svg src/testlib \ - src/tools src/xml src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/multimedia src/network src/opengl \ + src/openvg src/phonon src/qt3support src/s60installs \ + src/s60main src/script src/scripttools src/sql src/svg \ + src/testlib src/tools src/winmain src/xml src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../ +BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|^TARGET[[:blank:]]*=[[:blank:]]*|TARGET=${PORTNAME}-qt4|g' \ - ${WRKSRC}/${PORTNAME}.pro - ${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/uic-qt4 ${WRKSRC}/../../bin/uic - ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc + ${BUILD_WRKSRC}/${PORTNAME}.pro + ${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/uic-qt4 ${WRKSRC}/bin/uic + ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc .include <bsd.port.mk> diff --git a/devel/qt4-makeqpf/files/patch-tools-makeqpf-qpf2.cpp b/devel/qt4-makeqpf/files/patch-tools-makeqpf-qpf2.cpp index e91adeeccea1..ab46d51ae6c7 100644 --- a/devel/qt4-makeqpf/files/patch-tools-makeqpf-qpf2.cpp +++ b/devel/qt4-makeqpf/files/patch-tools-makeqpf-qpf2.cpp @@ -1,6 +1,6 @@ ---- qpf2.cpp Sun Jul 8 08:08:09 2007 -+++ qpf2.cpp Sun Jul 8 08:08:33 2007 -@@ -342,6 +342,8 @@ +--- tools/makeqpf/qpf2.cpp.orig 2009-09-07 13:00:31.000000000 +0200 ++++ tools/makeqpf/qpf2.cpp 2009-09-21 22:15:11.717123200 +0200 +@@ -363,6 +363,8 @@ int startGlyphIndex; }; diff --git a/devel/qt4-makeqpf/pkg-descr b/devel/qt4-makeqpf/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/devel/qt4-makeqpf/pkg-descr +++ b/devel/qt4-makeqpf/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4-moc/Makefile b/devel/qt4-moc/Makefile index 81844215a8e3..1a90e67c1666 100644 --- a/devel/qt4-moc/Makefile +++ b/devel/qt4-moc/Makefile @@ -8,7 +8,6 @@ PORTNAME= moc PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -29,27 +28,31 @@ 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/gui src/network src/opengl \ - src/phonon src/qt3support src/script src/sql src/svg \ - src/testlib src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/gui src/multimedia src/network \ + src/opengl src/openvg src/phonon src/qt3support \ + src/s60installs src/s60main src/script src/scripttools src/sql \ + src/svg src/testlib src/winmain src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/tools/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../../ +BUILD_WRKSRC= ${WRKSRC}/src/tools/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \ -e 's|^TARGET.*|TARGET=moc-qt4|g' \ - ${WRKSRC}/${PORTNAME}.pro - ${MKDIR} ${WRKSRC}/../../../mkspecs - ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../bin/qmake + ${BUILD_WRKSRC}/${PORTNAME}.pro + ${MKDIR} ${WRKSRC}/mkspecs + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake -do-build: - cd ${CONFIGURE_WRKSRC}/src/tools/bootstrap/ && make +pre-build: + cd ${BUILD_WRKSRC}/../bootstrap && ${MAKE} .include <bsd.port.mk> diff --git a/devel/qt4-moc/pkg-descr b/devel/qt4-moc/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/devel/qt4-moc/pkg-descr +++ b/devel/qt4-moc/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4-moc/pkg-plist b/devel/qt4-moc/pkg-plist index 90cb1d7dc8b1..690446be106a 100644 --- a/devel/qt4-moc/pkg-plist +++ b/devel/qt4-moc/pkg-plist @@ -1,2 +1,2 @@ bin/moc-qt4 -%%DEBUG%%bin/moc-qt4.debug
\ No newline at end of file +%%DEBUG%%bin/moc-qt4.debug diff --git a/devel/qt4-porting/Makefile b/devel/qt4-porting/Makefile index 8f36ce038f36..b0946ac660d8 100644 --- a/devel/qt4-porting/Makefile +++ b/devel/qt4-porting/Makefile @@ -28,23 +28,27 @@ 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/gui 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/activeqt src/dbus src/gui src/multimedia src/network \ + src/opengl src/openvg src/phonon src/qt3support \ + src/s60installs src/s60main src/script src/scripttools src/sql \ + src/svg src/testlib src/tools src/winmain src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../ +BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-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 - ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc + ${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 .include <bsd.port.mk> diff --git a/devel/qt4-porting/pkg-descr b/devel/qt4-porting/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/devel/qt4-porting/pkg-descr +++ b/devel/qt4-porting/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4-porting/pkg-plist b/devel/qt4-porting/pkg-plist index be89f2cc9eb9..34aee4a5f797 100644 --- a/devel/qt4-porting/pkg-plist +++ b/devel/qt4-porting/pkg-plist @@ -1,3 +1,4 @@ bin/qt3to4 %%DEBUG%%bin/qt3to4.debug share/qt4/q3porting.xml +@dirrmtry share/qt4 diff --git a/devel/qt4-qdbusviewer/Makefile b/devel/qt4-qdbusviewer/Makefile index 1b1fdc996b18..1cb9ce153ca4 100644 --- a/devel/qt4-qdbusviewer/Makefile +++ b/devel/qt4-qdbusviewer/Makefile @@ -8,7 +8,6 @@ PORTNAME= qdbusviewer PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -32,25 +31,29 @@ MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ PATH=${WRKSRC}/bin:$$PATH 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/kdebase \ - src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/multimedia src/network src/opengl src/openvg \ + src/phonon src/qt3support src/s60installs src/s60main \ + src/script src/scripttools src/sql src/svg src/testlib \ + src/tools src/winmain src/xmlpatterns src/3rdparty/clucene \ + src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ + src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ + src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/tools/qdbus/qdbusviewer -CONFIGURE_WRKSRC=${WRKSRC}/../../.. +BUILD_WRKSRC= ${WRKSRC}/tools/qdbus/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure .include <bsd.port.pre.mk> 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 - ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../../bin/rcc + ${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 .include <bsd.port.post.mk> diff --git a/devel/qt4-qdbusviewer/pkg-descr b/devel/qt4-qdbusviewer/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/devel/qt4-qdbusviewer/pkg-descr +++ b/devel/qt4-qdbusviewer/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4-qdoc3/Makefile b/devel/qt4-qdoc3/Makefile index 7c11aee0cabd..d43507b57366 100644 --- a/devel/qt4-qdoc3/Makefile +++ b/devel/qt4-qdoc3/Makefile @@ -25,7 +25,6 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --include '${DISTNAME}/tools/${PORTNAME}' PLIST_FILES= bin/${PORTNAME} WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME} -CONFIGURE_WRKSRC= ${WRKDIR}/${DISTNAME} do-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ diff --git a/devel/qt4-qdoc3/pkg-descr b/devel/qt4-qdoc3/pkg-descr index 31214eb2bc54..77b62e956498 100644 --- a/devel/qt4-qdoc3/pkg-descr +++ b/devel/qt4-qdoc3/pkg-descr @@ -4,4 +4,4 @@ source code. qdoc3 is the tool used to generate the Qt reference documentation. -WWW: http://www.trolltech.com/products/qt/index.html +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile index a4e41f4662f5..8396bfe1a2e5 100644 --- a/devel/qt4-qt3support/Makefile +++ b/devel/qt4-qt3support/Makefile @@ -8,7 +8,6 @@ PORTNAME= qt3support PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= devel x11-toolkits PKGNAMEPREFIX= qt4- @@ -31,29 +30,31 @@ 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/opengl src/phonon \ - src/script src/svg src/testlib \ - src/tools src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/multimedia src/opengl src/openvg \ + src/phonon src/s60installs src/s60main src/script \ + src/scripttools src/svg src/testlib src/tools src/winmain \ + src/xmlpatterns src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../ -PATCH_WRKSRC=${CONFIGURE_WRKSRC} +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-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 + ${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 + -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/Qt3Support.pc + ${WRKSRC}/lib/pkgconfig/Qt3Support.pc .include <bsd.port.mk> diff --git a/devel/qt4-qt3support/pkg-descr b/devel/qt4-qt3support/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/devel/qt4-qt3support/pkg-descr +++ b/devel/qt4-qt3support/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4-qt3support/pkg-plist b/devel/qt4-qt3support/pkg-plist index 67c5d4fd0a99..f5c8897b5ff3 100644 --- a/devel/qt4-qt3support/pkg-plist +++ b/devel/qt4-qt3support/pkg-plist @@ -409,6 +409,7 @@ lib/qt4/libQt3Support.so.%%SHLIB_SHVER%% lib/qt4/libQt3Support.so.%%SHLIB_VER%% @comment %%DEBUG%%lib/qt4/libQt3Support.so.%%SHLIB_VER%%.debug libdata/pkgconfig/Qt3Support.pc +@dirrmtry lib/qt4 @dirrm include/qt4/Qt3Support @dirrmtry include/qt4/Qt @dirrmtry include/qt4 diff --git a/devel/qt4-qtestlib/Makefile b/devel/qt4-qtestlib/Makefile index c4d5e2398f12..4c94a1434efd 100644 --- a/devel/qt4-qtestlib/Makefile +++ b/devel/qt4-qtestlib/Makefile @@ -8,7 +8,6 @@ PORTNAME= qtestlib PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -30,29 +29,32 @@ 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/gui src/network src/opengl src/phonon \ - src/qt3support src/script src/sql src/svg \ - src/tools src/xml src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/gui src/multimedia src/network \ + src/opengl src/openvg src/phonon src/qt3support \ + src/s60installs src/s60main src/script src/scripttools src/sql \ + src/svg src/tools src/winmain src/xml src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/testlib -CONFIGURE_WRKSRC=${WRKSRC}/../../ -PATCH_WRKSRC=${CONFIGURE_WRKSRC} +BUILD_WRKSRC= ${WRKSRC}/src/testlib +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-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 + ${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 + -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/QtTest.pc + ${WRKSRC}/lib/pkgconfig/QtTest.pc .include <bsd.port.mk> diff --git a/devel/qt4-qtestlib/pkg-descr b/devel/qt4-qtestlib/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/devel/qt4-qtestlib/pkg-descr +++ b/devel/qt4-qtestlib/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4-qtestlib/pkg-plist b/devel/qt4-qtestlib/pkg-plist index d667651a89c1..716acd4e2ce5 100644 --- a/devel/qt4-qtestlib/pkg-plist +++ b/devel/qt4-qtestlib/pkg-plist @@ -1,34 +1,54 @@ include/qt4/Qt/QtTest +include/qt4/Qt/qbenchmark.h include/qt4/Qt/qsignalspy.h include/qt4/Qt/qtest.h include/qt4/Qt/qtest_global.h include/qt4/Qt/qtest_gui.h include/qt4/Qt/qtestaccessible.h include/qt4/Qt/qtestassert.h +include/qt4/Qt/qtestbasicstreamer.h include/qt4/Qt/qtestcase.h +include/qt4/Qt/qtestcoreelement.h +include/qt4/Qt/qtestcorelist.h include/qt4/Qt/qtestdata.h +include/qt4/Qt/qtestelement.h +include/qt4/Qt/qtestelementattribute.h include/qt4/Qt/qtestevent.h include/qt4/Qt/qtesteventloop.h +include/qt4/Qt/qtestfilelogger.h include/qt4/Qt/qtestkeyboard.h +include/qt4/Qt/qtestlightxmlstreamer.h include/qt4/Qt/qtestmouse.h -include/qt4/Qt/qbenchmark.h include/qt4/Qt/qtestspontaneevent.h include/qt4/Qt/qtestsystem.h +include/qt4/Qt/qtesttouch.h +include/qt4/Qt/qtestxmlstreamer.h +include/qt4/Qt/qtestxunitstreamer.h include/qt4/QtTest/QEventSizeOfChecker include/qt4/QtTest/QSignalSpy include/qt4/QtTest/QSpontaneKeyEvent include/qt4/QtTest/QTest include/qt4/QtTest/QTestAccessibility include/qt4/QtTest/QTestAccessibilityEvent +include/qt4/QtTest/QTestBasicStreamer +include/qt4/QtTest/QTestCoreElement +include/qt4/QtTest/QTestCoreList include/qt4/QtTest/QTestData include/qt4/QtTest/QTestDelayEvent +include/qt4/QtTest/QTestElement +include/qt4/QtTest/QTestElementAttribute include/qt4/QtTest/QTestEvent include/qt4/QtTest/QTestEventList include/qt4/QtTest/QTestEventLoop +include/qt4/QtTest/QTestFileLogger include/qt4/QtTest/QTestKeyClicksEvent include/qt4/QtTest/QTestKeyEvent +include/qt4/QtTest/QTestLightXmlStreamer include/qt4/QtTest/QTestMouseEvent +include/qt4/QtTest/QTestXmlStreamer +include/qt4/QtTest/QTestXunitStreamer include/qt4/QtTest/QtTest +include/qt4/QtTest/QtTestGui include/qt4/QtTest/qbenchmark.h include/qt4/QtTest/qsignalspy.h include/qt4/QtTest/qtest.h @@ -36,14 +56,24 @@ include/qt4/QtTest/qtest_global.h include/qt4/QtTest/qtest_gui.h include/qt4/QtTest/qtestaccessible.h include/qt4/QtTest/qtestassert.h +include/qt4/QtTest/qtestbasicstreamer.h include/qt4/QtTest/qtestcase.h +include/qt4/QtTest/qtestcoreelement.h +include/qt4/QtTest/qtestcorelist.h include/qt4/QtTest/qtestdata.h +include/qt4/QtTest/qtestelement.h +include/qt4/QtTest/qtestelementattribute.h include/qt4/QtTest/qtestevent.h include/qt4/QtTest/qtesteventloop.h +include/qt4/QtTest/qtestfilelogger.h include/qt4/QtTest/qtestkeyboard.h +include/qt4/QtTest/qtestlightxmlstreamer.h include/qt4/QtTest/qtestmouse.h include/qt4/QtTest/qtestspontaneevent.h include/qt4/QtTest/qtestsystem.h +include/qt4/QtTest/qtesttouch.h +include/qt4/QtTest/qtestxmlstreamer.h +include/qt4/QtTest/qtestxunitstreamer.h lib/qt4/libQtTest.la lib/qt4/libQtTest.prl lib/qt4/libQtTest.so @@ -52,6 +82,7 @@ lib/qt4/libQtTest.so.%%SHLIB_SHVER%% lib/qt4/libQtTest.so.%%SHLIB_VER%% %%DEBUG%%lib/qt4/libQtTest.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtTest.pc +@dirrmtry lib/qt4 @dirrm include/qt4/QtTest @dirrmtry include/qt4/Qt @dirrmtry include/qt4 diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile index acac45dcf470..23ee6b354887 100644 --- a/devel/qt4-qvfb/Makefile +++ b/devel/qt4-qvfb/Makefile @@ -8,7 +8,6 @@ PORTNAME= qvfb PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -30,28 +29,32 @@ 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/network src/phonon \ - src/qt3support src/script src/sql src/svg src/testlib \ - src/tools src/xml src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/multimedia src/network src/opengl \ + src/openvg src/phonon src/qt3support src/s60installs \ + src/s60main src/script src/scripttools src/sql src/svg \ + src/testlib src/tools src/winmain src/xml src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../ +BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} -CONFIGURE_ARGS+= -I../../include/Qt -I../../include +CONFIGURE_ARGS+= -I../../include/Qt -I../../include + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} - ${MKDIR} ${WRKSRC}/../../mkspecs + ${MKDIR} ${WRKSRC}/mkspecs ${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=qvfb-qt4|g' \ - ${WRKSRC}/qvfb.pro - ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake - ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc - ${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/../../bin/uic - ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc + ${BUILD_WRKSRC}/qvfb.pro + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake + ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc + ${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/bin/uic + ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc .include <bsd.port.mk> diff --git a/devel/qt4-qvfb/pkg-descr b/devel/qt4-qvfb/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/devel/qt4-qvfb/pkg-descr +++ b/devel/qt4-qvfb/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4-rcc/Makefile b/devel/qt4-rcc/Makefile index 4a4e2b45025a..e3c97039afe2 100644 --- a/devel/qt4-rcc/Makefile +++ b/devel/qt4-rcc/Makefile @@ -28,26 +28,30 @@ 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/gui src/network src/opengl \ - src/phonon src/qt3support src/script src/sql src/svg \ - src/testlib src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/gui src/multimedia src/network \ + src/opengl src/openvg src/phonon src/qt3support \ + src/s60installs src/s60main src/script src/scripttools src/sql \ + src/svg src/testlib src/winmain src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/tools/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../../ +BUILD_WRKSRC= ${WRKSRC}/src/tools/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \ - ${WRKSRC}/${PORTNAME}.pro - ${MKDIR} ${WRKSRC}/../../../mkspecs - ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../bin/qmake + ${BUILD_WRKSRC}/${PORTNAME}.pro + ${MKDIR} ${WRKSRC}/mkspecs + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake -do-build: - cd ${CONFIGURE_WRKSRC}/src/tools/bootstrap/ && make +pre-build: + cd ${BUILD_WRKSRC}/../bootstrap && ${MAKE} .include <bsd.port.mk> diff --git a/devel/qt4-rcc/pkg-descr b/devel/qt4-rcc/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/devel/qt4-rcc/pkg-descr +++ b/devel/qt4-rcc/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4-script/Makefile b/devel/qt4-script/Makefile index 344db0549ee9..7f63c3117127 100644 --- a/devel/qt4-script/Makefile +++ b/devel/qt4-script/Makefile @@ -8,7 +8,6 @@ PORTNAME= script PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -27,33 +26,36 @@ 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 + PATH=${WRKSRC}/bin:$$PATH MAKEOBJDIR=. DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ - src/dbus src/gui 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 + src/activeqt src/dbus src/gui src/multimedia src/network \ + src/opengl src/openvg src/phonon src/qt3support \ + src/s60installs src/s60main src/scripttools src/sql src/svg \ + src/testlib src/tools src/winmain src/xml src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../ -PATCH_WRKSRC=${WRKSRC}/../../ +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-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 + ${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 + -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/QtScript.pc + ${WRKSRC}/lib/pkgconfig/QtScript.pc .include <bsd.port.mk> diff --git a/devel/qt4-script/files/patch-src-3rdparty-javascriptcore-JavaScriptCore-wtf-Platform.h b/devel/qt4-script/files/patch-src-3rdparty-javascriptcore-JavaScriptCore-wtf-Platform.h new file mode 100644 index 000000000000..4107f95ac743 --- /dev/null +++ b/devel/qt4-script/files/patch-src-3rdparty-javascriptcore-JavaScriptCore-wtf-Platform.h @@ -0,0 +1,14 @@ +--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2009-10-20 20:13:33.000000000 +1100 ++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2009-10-16 16:01:06.000000000 +1100 +@@ -700,9 +700,9 @@ + #endif + + #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) +-#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(SOLARIS) || PLATFORM(HPUX)) ++#if (PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(FREEBSD) || PLATFORM(SOLARIS) || PLATFORM(HPUX))) + #define WTF_USE_JSVALUE64 1 +-#elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) ++#elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) || PLATFORM(ALPHA) + #define WTF_USE_JSVALUE64 1 + #elif PLATFORM(ARM) || PLATFORM(PPC64) + #define WTF_USE_JSVALUE32 1 diff --git a/devel/qt4-script/pkg-descr b/devel/qt4-script/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/devel/qt4-script/pkg-descr +++ b/devel/qt4-script/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4-script/pkg-plist b/devel/qt4-script/pkg-plist index 6efc6c64f0b7..8ad07445e010 100644 --- a/devel/qt4-script/pkg-plist +++ b/devel/qt4-script/pkg-plist @@ -8,6 +8,7 @@ include/qt4/Qt/qscriptengine.h include/qt4/Qt/qscriptengineagent.h include/qt4/Qt/qscriptextensioninterface.h include/qt4/Qt/qscriptextensionplugin.h +include/qt4/Qt/qscriptprogram.h include/qt4/Qt/qscriptstring.h include/qt4/Qt/qscriptvalue.h include/qt4/Qt/qscriptvalueiterator.h @@ -20,6 +21,7 @@ include/qt4/QtScript/QScriptEngine include/qt4/QtScript/QScriptEngineAgent include/qt4/QtScript/QScriptExtensionInterface include/qt4/QtScript/QScriptExtensionPlugin +include/qt4/QtScript/QScriptProgram include/qt4/QtScript/QScriptString include/qt4/QtScript/QScriptSyntaxCheckResult include/qt4/QtScript/QScriptValue @@ -36,6 +38,7 @@ include/qt4/QtScript/qscriptengine.h include/qt4/QtScript/qscriptengineagent.h include/qt4/QtScript/qscriptextensioninterface.h include/qt4/QtScript/qscriptextensionplugin.h +include/qt4/QtScript/qscriptprogram.h include/qt4/QtScript/qscriptstring.h include/qt4/QtScript/qscriptvalue.h include/qt4/QtScript/qscriptvalueiterator.h @@ -47,6 +50,7 @@ lib/qt4/libQtScript.so.%%SHLIB_SHVER%% lib/qt4/libQtScript.so.%%SHLIB_VER%% %%DEBUG%%lib/qt4/libQtScript.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtScript.pc +@dirrmtry lib/qt4 @dirrm include/qt4/QtScript @dirrmtry include/qt4/Qt @dirrmtry include/qt4 diff --git a/devel/qt4-scripttools/Makefile b/devel/qt4-scripttools/Makefile index 3b605676635b..89a8b889efdb 100644 --- a/devel/qt4-scripttools/Makefile +++ b/devel/qt4-scripttools/Makefile @@ -7,7 +7,6 @@ PORTNAME= scripttools PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -29,20 +28,24 @@ 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 + src/activeqt src/dbus src/multimedia src/network src/opengl \ + src/openvg src/phonon src/qt3support src/s60installs \ + src/s60main src/sql src/svg src/testlib src/tools src/winmain \ + src/xml src/xmlpatterns src/3rdparty/clucene \ + src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ + src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ + 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} +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure 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 diff --git a/devel/qt4-scripttools/pkg-descr b/devel/qt4-scripttools/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/devel/qt4-scripttools/pkg-descr +++ b/devel/qt4-scripttools/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4-scripttools/pkg-plist b/devel/qt4-scripttools/pkg-plist index af0e5c7c5463..8ca8ad449dde 100644 --- a/devel/qt4-scripttools/pkg-plist +++ b/devel/qt4-scripttools/pkg-plist @@ -11,4 +11,7 @@ lib/qt4/libQtScriptTools.so.%%SHLIB_SHVER%% lib/qt4/libQtScriptTools.so.%%SHLIB_VER%% %%DEBUG%%lib/qt4/libQtScriptTools.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtScriptTools.pc +@dirrmtry lib/qt4 @dirrm include/qt4/QtScriptTools +@dirrmtry include/qt4/Qt +@dirrmtry include/qt4 diff --git a/devel/qt4-uic/Makefile b/devel/qt4-uic/Makefile index 971adc47fcc2..4070c2917d6c 100644 --- a/devel/qt4-uic/Makefile +++ b/devel/qt4-uic/Makefile @@ -8,7 +8,6 @@ PORTNAME= uic PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -29,27 +28,31 @@ 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/gui src/network src/opengl \ - src/phonon src/qt3support src/script src/sql src/svg \ - src/testlib src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/gui src/multimedia src/network \ + src/opengl src/openvg src/phonon src/qt3support \ + src/s60installs src/s60main src/script src/scripttools src/sql \ + src/svg src/testlib src/winmain src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/tools/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../../ +BUILD_WRKSRC= ${WRKSRC}/src/tools/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \ -e 's|^TARGET.*|TARGET=uic-qt4|g' \ - ${WRKSRC}/${PORTNAME}.pro - ${MKDIR} ${WRKSRC}/../../../mkspecs - ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../bin/qmake + ${BUILD_WRKSRC}/${PORTNAME}.pro + ${MKDIR} ${WRKSRC}/mkspecs + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake -do-build: - cd ${CONFIGURE_WRKSRC}/src/tools/bootstrap/ && make +pre-build: + cd ${BUILD_WRKSRC}/../bootstrap && ${MAKE} .include <bsd.port.mk> diff --git a/devel/qt4-uic/pkg-descr b/devel/qt4-uic/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/devel/qt4-uic/pkg-descr +++ b/devel/qt4-uic/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile index 2b6ca57b3b43..9a35743c7efc 100644 --- a/devel/qt4-uic3/Makefile +++ b/devel/qt4-uic3/Makefile @@ -8,7 +8,6 @@ PORTNAME= uic3 PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -29,21 +28,24 @@ 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/opengl src/phonon \ - src/script src/svg src/testlib \ - src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/multimedia src/network src/opengl \ + src/openvg src/phonon src/s60installs src/s60main src/script \ + src/scripttools src/sql src/svg src/testlib src/winmain \ + src/xmlpatterns src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/tools/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../../ +BUILD_WRKSRC= ${WRKSRC}/src/tools/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} - ${MKDIR} ${WRKSRC}/../../../mkspecs - ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../bin/qmake + ${MKDIR} ${WRKSRC}/mkspecs + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake .include <bsd.port.mk> diff --git a/devel/qt4-uic3/pkg-descr b/devel/qt4-uic3/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/devel/qt4-uic3/pkg-descr +++ b/devel/qt4-uic3/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4/Makefile b/devel/qt4/Makefile index 4ca0b5277b35..6c2d0882b48e 100644 --- a/devel/qt4/Makefile +++ b/devel/qt4/Makefile @@ -7,34 +7,34 @@ PORTNAME= qt4 PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_QT} -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE +MASTER_SITES= # empty +DISTFILES= # none +EXTRACT_ONLY= # empty MAINTAINER= kde@FreeBSD.org COMMENT= Multiplatform C++ application framework (metaport) -OPTIONS= SQL_PLUGINS "Database connectivity plugins for QtSql" off \ +OPTIONS= CODECS "Enable support for CN, JP, KR, TW" off \ + PHONON "Phonon support" off \ QTCONFIG "Qt configuration (depends on PHONON)" off \ - PHONON "Phonon support (conflicts with KDE4)" off \ - CODECS "Enable support for CN, JP, KR, TW" off \ - TOOLS "Install Qt tools (qmake, moc, etc.)" off + SQL_PLUGINS "Database connectivity plugins for QtSql" off \ + TOOLS "Install Qt tools (qmake, moc, etc.)" off \ + DEMO "Install demonstration and example programs" off 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 scripttools sql svg webkit \ - xml xmlpatterns xmlpatterns-tool + clucene corelib dbus designer doc help gui iconengines \ + imageformats inputmethods multimedia network opengl \ + qdbusviewer qt3support qtestlib qvfb script scripttools \ + sql svg webkit xml xmlpatterns xmlpatterns-tool NO_BUILD= yes .include <bsd.port.pre.mk> .if !defined(WITHOUT_NLS) -RUN_DEPENDS+= qt4-l10n>=${QT4_VERSION}:${PORTSDIR}/misc/qt4-l10n +QT_COMPONENTS+= l10n .endif .if defined(WITH_TOOLS) @@ -55,13 +55,16 @@ QT_COMPONENTS+= codecs-cn codecs-jp codecs-kr codecs-tw .endif .if defined(WITH_SQL_PLUGINS) -RUN_DEPENDS+= ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin \ - ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlodbc.so:${PORTSDIR}/databases/qt4-odbc-plugin \ - ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt4-pgsql-plugin \ - ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlite2.so:${PORTSDIR}/databases/qt4-sqlite-plugin \ - ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlite.so:${PORTSDIR}/databases/qt4-sqlite3-plugin +QT_COMPONENTS+= sql-mysql sql-odbc sql-pgsql sql-sqlite2 sql-sqlite3 .endif +.if defined(WITH_DEMO) +QT_COMPONENTS+= demo +.endif + +do-patch: #empty + ${DO_NADA} + do-install: #empty ${DO_NADA} diff --git a/devel/qt4/distinfo b/devel/qt4/distinfo index 5d04b269780e..6c9994b1a77e 100644 --- a/devel/qt4/distinfo +++ b/devel/qt4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.5.3.tar.gz) = 3988cf9af68be2df8a8000ede231de9b -SHA256 (KDE/qt-x11-opensource-src-4.5.3.tar.gz) = 0c87fc42825d3556970db4412257c6874e716ac3bc45e6f273924d5d6a089aa6 -SIZE (KDE/qt-x11-opensource-src-4.5.3.tar.gz) = 125384668 +MD5 (KDE/qt-everywhere-opensource-src-4.6.1.tar.gz) = 0542a4be6425451ab5f668c6899cac36 +SHA256 (KDE/qt-everywhere-opensource-src-4.6.1.tar.gz) = 4c84b39b8a2546854ce9c0c9f761dd55da76dab2c33eeb876e3d17db1d2ea0c5 +SIZE (KDE/qt-everywhere-opensource-src-4.6.1.tar.gz) = 160197277 diff --git a/devel/qt4/files/configure b/devel/qt4/files/configure deleted file mode 100644 index 412ba46d35dd..000000000000 --- a/devel/qt4/files/configure +++ /dev/null @@ -1,7392 +0,0 @@ -#!/bin/sh -############################################################################# -## -## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -## All rights reserved. -## Contact: Nokia Corporation (qt-info@nokia.com) -## -## This file is the build configuration utility of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL$ -## Commercial Usage -## Licensees holding valid Qt Commercial licenses may use this file in -## accordance with the Qt Commercial License Agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Nokia. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 as published by the Free Software -## Foundation and appearing in the file LICENSE.LGPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU Lesser General Public License version 2.1 requirements -## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## In addition, as a special exception, Nokia gives you certain additional -## rights. These rights are described in the Nokia Qt LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3.0 as published by the Free Software -## Foundation and appearing in the file LICENSE.GPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU General Public License version 3.0 requirements will be -## met: http://www.gnu.org/copyleft/gpl.html. -## -## If you have questions regarding the use of this file, please contact -## Nokia at qt-info@nokia.com. -## $QT_END_LICENSE$ -## -############################################################################# - -#------------------------------------------------------------------------------- -# script initialization -#------------------------------------------------------------------------------- - -# the name of this script -relconf=`basename $0` -# the directory of this script is the "source tree" -relpath=`dirname $0` -relpath=`(cd "$relpath"; /bin/pwd)` -# the current directory is the "build tree" or "object tree" -outpath=`/bin/pwd` - -#license file location -LICENSE_FILE="$QT_LICENSE_FILE" -[ -z "$LICENSE_FILE" ] && LICENSE_FILE="$HOME/.qt-license" -if [ -f "$LICENSE_FILE" ]; then - tr -d '\r' <"$LICENSE_FILE" >"${LICENSE_FILE}.tmp" - diff "${LICENSE_FILE}.tmp" "${LICENSE_FILE}" >/dev/null 2>&1 || LICENSE_FILE="${LICENSE_FILE}.tmp" -fi - -# later cache the command line in config.status -OPT_CMDLINE=`echo $@ | sed "s,-v ,,g; s,-v$,,g"` - -# initialize global variables -QMAKE_SWITCHES= -QMAKE_VARS= -QMAKE_CONFIG= -QTCONFIG_CONFIG= -QT_CONFIG= -SUPPORTED= -QMAKE_VARS_FILE=.qmake.vars - -:> "$QMAKE_VARS_FILE" - -#------------------------------------------------------------------------------- -# utility functions -#------------------------------------------------------------------------------- - -# Adds a new qmake variable to the cache -# Usage: QMakeVar mode varname contents -# where mode is one of: set, add, del -QMakeVar() -{ - case "$1" in - set) - eq="=" - ;; - add) - eq="+=" - ;; - del) - eq="-=" - ;; - *) - echo >&2 "BUG: wrong command to QMakeVar: $1" - ;; - esac - - echo "$2" "$eq" "$3" >> "$QMAKE_VARS_FILE" -} - -# relies on $QMAKESPEC being set correctly. parses include statements in -# qmake.conf and prints out the expanded file -getQMakeConf() -{ - tmpSPEC="$QMAKESPEC" - if [ -n "$1" ]; then - tmpSPEC="$1" - fi - $AWK -v "QMAKESPEC=$tmpSPEC" ' -/^include\(.+\)$/{ - fname = QMAKESPEC "/" substr($0, 9, length($0) - 9) - while ((getline line < fname) > 0) - print line - close(fname) - next -} -{ print }' "$tmpSPEC/qmake.conf" -} - -#------------------------------------------------------------------------------- -# operating system detection -#------------------------------------------------------------------------------- - -# need that throughout the script -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - - -#------------------------------------------------------------------------------- -# window system detection -#------------------------------------------------------------------------------- - -PLATFORM_X11=no -PLATFORM_MAC=no -PLATFORM_QWS=no - -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 - # ~ this is the internal edition and Qt/Mac sources exist - PLATFORM_MAC=maybe -elif [ -f "$relpath"/src/gui/kernel/qapplication_qws.cpp ]; then - # Qt Embedded - # ~ 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 - 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 - -#----------------------------------------------------------------------------- -# Qt version detection -#----------------------------------------------------------------------------- -QT_VERSION=`grep '^# *define *QT_VERSION_STR' "$relpath"/src/corelib/global/qglobal.h` -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,'` - 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,'` - PATCH=`echo $QT_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\3,'` - QT_MAJOR_VERSION="$MAJOR" - [ -z "$MINOR" ] || QT_MINOR_VERSION="$MINOR" - [ -z "$PATCH" ] || QT_PATCH_VERSION="$PATCH" - fi -fi -if [ -z "$QT_MAJOR_VERSION" ]; then - echo "Cannot process version from qglobal.h: $QT_VERSION" - echo "Cannot proceed." - exit 1 -fi - -QT_PACKAGEDATE=`grep '^# *define *QT_PACKAGEDATE_STR' "$relpath"/src/corelib/global/qglobal.h | sed -e 's,^# *define *QT_PACKAGEDATE_STR *"\([^ ]*\)"$,\1,' -e s,-,,g` -if [ -z "$QT_PACKAGEDATE" ]; then - echo "Unable to determine package date from qglobal.h: '$QT_PACKAGEDATE'" - echo "Cannot proceed" - exit 1 -fi - -#------------------------------------------------------------------------------- -# check the license -#------------------------------------------------------------------------------- -COMMERCIAL_USER=ask -CFG_DEV=no -CFG_NOKIA=no -CFG_EMBEDDED=no -EditionString=Commercial - -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" - [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes -elif [ -f "$relpath"/LICENSE.PREVIEW.COMMERCIAL ] && [ $COMMERCIAL_USER = "yes" ]; then - # Commercial preview release - [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes - Licensee="Preview" - Edition="Preview" - QT_EDITION="QT_EDITION_DESKTOP" - LicenseType="Technology Preview" -elif [ $COMMERCIAL_USER = "yes" ]; then - # one of commercial editions - [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes - [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes - - # read in the license file - if [ -f "$LICENSE_FILE" ]; then - . "$LICENSE_FILE" >/dev/null 2>&1 - if [ -z "$LicenseKeyExt" ]; then - echo - echo "You are using an old license file." - echo - 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 - fi - if [ -z "$Licensee" ]; then - echo - echo "Invalid license key. Please check the license key." - exit 1 - fi - else - if [ -z "$LicenseKeyExt" ]; then - echo - if echo '\c' | grep '\c' >/dev/null; then - echo -n "Please enter your license key: " - else - echo "Please enter your license key: \c" - fi - read LicenseKeyExt - Licensee="Unknown user" - fi - fi - - # Key verification - echo "$LicenseKeyExt" | grep ".....*-....*-....*-....*-.....*-.....*-...." >/dev/null 2>&1 \ - && LicenseValid="yes" \ - || LicenseValid="no" - if [ "$LicenseValid" != "yes" ]; then - echo - echo "Invalid license key. Please check the license key." - exit 1 - fi - ProductCode=`echo $LicenseKeyExt | cut -f 1 -d - | cut -b 1` - PlatformCode=`echo $LicenseKeyExt | cut -f 2 -d - | cut -b 1` - LicenseTypeCode=`echo $LicenseKeyExt | cut -f 3 -d -` - LicenseFeatureCode=`echo $LicenseKeyExt | cut -f 4 -d - | cut -b 1` - - # determine which edition we are licensed to use - case "$LicenseTypeCode" in - F4M) - LicenseType="Commercial" - case $ProductCode in - F) - Edition="Universal" - QT_EDITION="QT_EDITION_UNIVERSAL" - ;; - B) - Edition="FullFramework" - EditionString="Full Framework" - QT_EDITION="QT_EDITION_DESKTOP" - ;; - L) - Edition="GUIFramework" - EditionString="GUI Framework" - QT_EDITION="QT_EDITION_DESKTOPLIGHT" - ;; - esac - ;; - Z4M|R4M|Q4M) - LicenseType="Evaluation" - case $ProductCode in - B) - Edition="Evaluation" - QT_EDITION="QT_EDITION_EVALUATION" - ;; - esac - ;; - esac - if [ -z "$LicenseType" -o -z "$Edition" -o -z "$QT_EDITION" ]; then - echo - echo "Invalid license key. Please check the license key." - exit 1 - fi - - # verify that we are licensed to use Qt on this platform - LICENSE_EXTENSION= - if [ "$PlatformCode" = "X" ]; then - # Qt All-OS - LICENSE_EXTENSION="-ALLOS" - elif [ "$PLATFORM_QWS" = "yes" ]; then - case $PlatformCode in - 2|4|8|A|B|E|G|J|K|P|Q|S|U|V|W) - # Qt for Embedded Linux - LICENSE_EXTENSION="-EMBEDDED" - ;; - *) - echo - echo "You are not licensed for Qt for Embedded Linux." - echo - echo "Please contact qt-info@nokia.com to upgrade your license" - echo "to include Qt for Embedded Linux, or install the" - echo "Qt Open Source Edition if you intend to develop free software." - exit 1 - ;; - esac - elif [ "$PLATFORM_MAC" = "yes" ]; then - case $PlatformCode in - 2|4|5|7|9|B|C|E|F|G|L|M|U|W|Y) - # Qt/Mac - LICENSE_EXTENSION="-DESKTOP" - ;; - 3|6|8|A|D|H|J|K|P|Q|S|V) - # Embedded no-deploy - LICENSE_EXTENSION="-EMBEDDED" - ;; - *) - echo - echo "You are not licensed for the Qt/Mac platform." - echo - echo "Please contact qt-info@nokia.com to upgrade your license" - echo "to include the Qt/Mac platform." - exit 1 - ;; - esac - else - case $PlatformCode in - 2|3|4|5|7|D|E|F|J|M|Q|S|T|V|Z) - # Qt/X11 - LICENSE_EXTENSION="-DESKTOP" - ;; - 6|8|9|A|B|C|G|H|K|P|U|W) - # Embedded no-deploy - LICENSE_EXTENSION="-EMBEDDED" - ;; - *) - echo - echo "You are not licensed for the Qt/X11 platform." - echo - echo "Please contact qt-info@nokia.com to upgrade your license to" - echo "include the Qt/X11 platform, or install the Qt Open Source Edition" - echo "if you intend to develop free software." - exit 1 - ;; - 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 - case "$LicenseType" in - Commercial) - cp -f "$relpath/.LICENSE${LICENSE_EXTENSION}-US" "$outpath/LICENSE" - ;; - Evaluation) - cp -f "$relpath/.LICENSE-EVALUATION-US" "$outpath/LICENSE" - ;; - esac - ;; - 2|5) - # non-US - case "$LicenseType" in - Commercial) - cp -f "$relpath/.LICENSE${LICENSE_EXTENSION}" "$outpath/LICENSE" - ;; - Evaluation) - cp -f "$relpath/.LICENSE-EVALUATION" "$outpath/LICENSE" - ;; - esac - ;; - *) - echo - echo "Invalid license key. Please check the license key." - exit 1 - ;; - esac - if [ '!' -f "$outpath/LICENSE" ]; then - 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." - echo "Try re-installing." - 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 - -#------------------------------------------------------------------------------- -# 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_'${qmakevarname}' "\$'${varname}'" -fi'` - eval "$cmd" -done -# Use CC/CXX to run config.tests -mkdir -p "$outpath/config.tests" -rm -f "$outpath/config.tests/.qmake.cache" -cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache" - -QMakeVar add styles "cde mac motif plastique cleanlooks windows" -QMakeVar add decorations "default windows styled" -QMakeVar add gfx-drivers "linuxfb" -QMakeVar add kbd-drivers "tty" -QMakeVar add mouse-drivers "pc linuxtp" - -if [ "$CFG_DEV" = "yes" ]; then - QMakeVar add kbd-drivers "um" -fi - -# QTDIR may be set and point to an old or system-wide Qt installation -unset QTDIR - -# the minimum version of libdbus-1 that we require: -MIN_DBUS_1_VERSION=0.62 - -# initalize internal variables -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_DEBUG=auto -CFG_MYSQL_CONFIG= -CFG_DEBUG_RELEASE=no -CFG_SHARED=yes -CFG_SM=auto -CFG_XSHAPE=auto -CFG_XSYNC=auto -CFG_XINERAMA=runtime -CFG_XFIXES=runtime -CFG_ZLIB=auto -CFG_SQLITE=qt -CFG_GIF=auto -CFG_TIFF=auto -CFG_LIBTIFF=auto -CFG_PNG=yes -CFG_LIBPNG=auto -CFG_JPEG=auto -CFG_LIBJPEG=auto -CFG_MNG=auto -CFG_LIBMNG=auto -CFG_XCURSOR=runtime -CFG_XRANDR=runtime -CFG_XRENDER=auto -CFG_MITSHM=auto -CFG_OPENGL=auto -CFG_SSE=auto -CFG_FONTCONFIG=auto -CFG_QWS_FREETYPE=auto -CFG_LIBFREETYPE=auto -CFG_SQL_AVAILABLE= -QT_DEFAULT_BUILD_PARTS="libs tools examples demos docs translations" -CFG_BUILD_PARTS="" -CFG_NOBUILD_PARTS="" -CFG_RELEASE_QMAKE=no -CFG_PHONON=auto -CFG_PHONON_BACKEND=yes -CFG_SVG=yes -CFG_WEBKIT=auto # (yes|no|auto) - -CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen" -CFG_GFX_ON="linuxfb multiscreen" -CFG_GFX_PLUGIN_AVAILABLE= -CFG_GFX_PLUGIN= -CFG_GFX_OFF= -CFG_KBD_AVAILABLE="tty usb sl5000 yopy vr41xx qvfb" -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 - -CFG_ARCH= -CFG_HOST_ARCH= -CFG_KBD_PLUGIN_AVAILABLE= -CFG_KBD_PLUGIN= -CFG_KBD_OFF= -CFG_MOUSE_PLUGIN_AVAILABLE= -CFG_MOUSE_PLUGIN= -CFG_MOUSE_OFF= -CFG_USE_GNUMAKE=no -CFG_IM=yes -CFG_DECORATION_AVAILABLE="styled windows default" -CFG_DECORATION_ON="${CFG_DECORATION_AVAILABLE}" # all on by default -CFG_DECORATION_PLUGIN_AVAILABLE= -CFG_DECORATION_PLUGIN= -CFG_XINPUT=runtime -CFG_XKB=auto -CFG_NIS=auto -CFG_CUPS=auto -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 -CFG_REDUCE_EXPORTS=auto -CFG_MMX=auto -CFG_3DNOW=auto -CFG_SSE=auto -CFG_SSE2=auto -CFG_REDUCE_RELOCATIONS=no -CFG_IPV6=auto -CFG_NAS=no -CFG_QWS_DEPTHS=all -CFG_USER_BUILD_KEY= -CFG_ACCESSIBILITY=auto -CFG_QT3SUPPORT=yes -CFG_ENDIAN=auto -CFG_HOST_ENDIAN=auto -CFG_DOUBLEFORMAT=auto -CFG_ARMFPA=auto -CFG_IWMMXT=no -CFG_CLOCK_GETTIME=auto -CFG_CLOCK_MONOTONIC=auto -CFG_MREMAP=auto -CFG_GETADDRINFO=auto -CFG_IPV6IFNAME=auto -CFG_GETIFADDRS=auto -CFG_INOTIFY=auto -CFG_RPATH=yes -CFG_FRAMEWORK=auto -CFG_MAC_ARCHS= -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= -D_FLAGS= -I_FLAGS= -L_FLAGS= -RPATH_FLAGS= -l_FLAGS= -QCONFIG_FLAGS= -XPLATFORM= # This seems to be the QMAKESPEC, like "linux-g++" -PLATFORM=$QMAKESPEC -QT_CROSS_COMPILE=no -OPT_CONFIRM_LICENSE=no -OPT_SHADOW=maybe -OPT_FAST=auto -OPT_VERBOSE=no -OPT_HELP= -CFG_SILENT=no -CFG_GRAPHICS_SYSTEM=default - -# initalize variables used for installation -QT_INSTALL_PREFIX= -QT_INSTALL_DOCS= -QT_INSTALL_HEADERS= -QT_INSTALL_LIBS= -QT_INSTALL_BINS= -QT_INSTALL_PLUGINS= -QT_INSTALL_DATA= -QT_INSTALL_TRANSLATIONS= -QT_INSTALL_SETTINGS= -QT_INSTALL_EXAMPLES= -QT_INSTALL_DEMOS= -QT_HOST_PREFIX= - -#flags for SQL drivers -QT_CFLAGS_PSQL= -QT_LFLAGS_PSQL= -QT_CFLAGS_MYSQL= -QT_LFLAGS_MYSQL= -QT_LFLAGS_MYSQL_R= -QT_CFLAGS_SQLITE= -QT_LFLAGS_SQLITE= - -# flags for libdbus-1 -QT_CFLAGS_DBUS= -QT_LIBS_DBUS= - -# flags for Glib (X11 only) -QT_CFLAGS_GLIB= -QT_LIBS_GLIB= - -# flags for GStreamer (X11 only) -QT_CFLAGS_GSTREAMER= -QT_LIBS_GSTREAMER= - -#------------------------------------------------------------------------------- -# check SQL drivers, mouse drivers and decorations available in this package -#------------------------------------------------------------------------------- - -# opensource version removes some drivers, so force them to be off -CFG_SQL_tds=no -CFG_SQL_oci=no -CFG_SQL_db2=no - -CFG_SQL_AVAILABLE= -if [ -d "$relpath/src/plugins/sqldrivers" ]; then - for a in "$relpath/src/plugins/sqldrivers/"*; do - if [ -d "$a" ]; then - base_a=`basename $a` - CFG_SQL_AVAILABLE="${CFG_SQL_AVAILABLE} ${base_a}" - eval "CFG_SQL_${base_a}=auto" - fi - done -fi - -CFG_DECORATION_PLUGIN_AVAILABLE= -if [ -d "$relpath/src/plugins/decorations" ]; then - for a in "$relpath/src/plugins/decorations/"*; do - if [ -d "$a" ]; then - base_a=`basename $a` - CFG_DECORATION_PLUGIN_AVAILABLE="${CFG_DECORATION_PLUGIN_AVAILABLE} ${base_a}" - fi - done -fi - -CFG_KBD_PLUGIN_AVAILABLE= -if [ -d "$relpath/src/plugins/kbddrivers" ]; then - for a in "$relpath/src/plugins/kbddrivers/"*; do - if [ -d "$a" ]; then - base_a=`basename $a` - CFG_KBD_PLUGIN_AVAILABLE="${CFG_KBD_PLUGIN_AVAILABLE} ${base_a}" - fi - done -fi - -CFG_MOUSE_PLUGIN_AVAILABLE= -if [ -d "$relpath/src/plugins/mousedrivers" ]; then - for a in "$relpath/src/plugins/mousedrivers/"*; do - if [ -d "$a" ]; then - base_a=`basename $a` - CFG_MOUSE_PLUGIN_AVAILABLE="${CFG_MOUSE_PLUGIN_AVAILABLE} ${base_a}" - fi - done -fi - -CFG_GFX_PLUGIN_AVAILABLE= -if [ -d "$relpath/src/plugins/gfxdrivers" ]; then - for a in "$relpath/src/plugins/gfxdrivers/"*; do - if [ -d "$a" ]; then - base_a=`basename $a` - CFG_GFX_PLUGIN_AVAILABLE="${CFG_GFX_PLUGIN_AVAILABLE} ${base_a}" - fi - done - CFG_GFX_OFF="$CFG_GFX_AVAILABLE" # assume all off -fi - -#------------------------------------------------------------------------------- -# parse command line arguments -#------------------------------------------------------------------------------- - -# 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 - ;; - --*) - VAR=`echo $1 | sed "s,^--\(.*\),\1,"` - VAL=yes - ;; - #Qt plugin options - -no-*-*|-plugin-*-*|-qt-*-*) - VAR=`echo $1 | sed "s,^-[^-]*-\(.*\),\1,"` - VAL=`echo $1 | sed "s,^-\([^-]*\).*,\1,"` - ;; - #Qt style no options - -no-*) - VAR=`echo $1 | sed "s,^-no-\(.*\),\1,"` - VAL=no - ;; - #Qt style yes options - -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-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 - ;; - #Qt style options that pass an argument - -qconfig) - if [ "$PLATFORM_QWS" = "yes" ]; then - CFG_QCONFIG="$VAL" - VAR=`echo $1 | sed "s,^-\(.*\),\1,"` - shift - VAL=$1 - else - UNKNOWN_ARG=yes - fi - ;; - -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config) - VAR=`echo $1 | sed "s,^-\(.*\),\1,"` - shift - VAL="$1" - ;; - #Qt style complex options in one command - -enable-*|-disable-*) - VAR=`echo $1 | sed "s,^-\([^-]*\)-.*,\1,"` - VAL=`echo $1 | sed "s,^-[^-]*-\(.*\),\1,"` - ;; - #Qt Builtin/System style options - -no-*|-system-*|-qt-*) - VAR=`echo $1 | sed "s,^-[^-]*-\(.*\),\1,"` - VAL=`echo $1 | sed "s,^-\([^-]*\)-.*,\1,"` - ;; - #Options that cannot be generalized - -k|-continue) - VAR=fatal_error - 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 - ;; - -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 - if [ -z "$2" ] || echo "$2" | grep '^-' >/dev/null 2>&1; then - VAL=$outpath - else - shift; - VAL=$1 - fi - ;; - -host-*-endian) - VAR=host_endian - VAL=`echo $1 | sed "s,^-.*-\(.*\)-.*,\1,"` - ;; - -*-endian) - VAR=endian - VAL=`echo $1 | sed "s,^-\(.*\)-.*,\1,"` - ;; - -qtnamespace) - VAR="qtnamespace" - shift - VAL="$1" - ;; - -graphicssystem) - VAR="graphicssystem" - shift - VAL=$1 - ;; - -qtlibinfix) - VAR="qtlibinfix" - shift - VAL="$1" - ;; - -D?*|-D) - VAR="add_define" - if [ "$1" = "-D" ]; then - shift - VAL="$1" - else - VAL=`echo $1 | sed 's,-D,,'` - fi - ;; - -I?*|-I) - VAR="add_ipath" - if [ "$1" = "-I" ]; then - shift - VAL="$1" - else - VAL=`echo $1 | sed 's,-I,,'` - fi - ;; - -L?*|-L) - VAR="add_lpath" - if [ "$1" = "-L" ]; then - shift - VAL="$1" - else - VAL=`echo $1 | sed 's,-L,,'` - fi - ;; - -R?*|-R) - VAR="add_rpath" - if [ "$1" = "-R" ]; then - shift - VAL="$1" - else - VAL=`echo $1 | sed 's,-R,,'` - fi - ;; - -l?*) - VAR="add_link" - VAL=`echo $1 | sed 's,-l,,'` - ;; - -F?*|-F) - VAR="add_fpath" - if [ "$1" = "-F" ]; then - shift - VAL="$1" - else - VAL=`echo $1 | sed 's,-F,,'` - fi - ;; - -fw?*|-fw) - VAR="add_framework" - if [ "$1" = "-fw" ]; then - shift - VAL="$1" - else - VAL=`echo $1 | sed 's,-fw,,'` - fi - ;; - -*) - VAR=`echo $1 | sed "s,^-\(.*\),\1,"` - VAL="unknown" - ;; - *) - UNKNOWN_ARG=yes - ;; - esac - if [ "$UNKNOWN_ARG" = "yes" ]; then - echo "$1: unknown argument" - OPT_HELP=yes - ERROR=yes - shift - continue - fi - shift - - UNKNOWN_OPT=no - case "$VAR" in - qt3support) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_QT3SUPPORT="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - accessibility) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_ACCESSIBILITY="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - license) - LICENSE_FILE="$VAL" - ;; - gnumake) - CFG_USE_GNUMAKE="$VAL" - ;; - mysql_config) - CFG_MYSQL_CONFIG="$VAL" - ;; - prefix) - QT_INSTALL_PREFIX="$VAL" - ;; - hostprefix) - QT_HOST_PREFIX="$VAL" - ;; - force-pkg-config) - QT_FORCE_PKGCONFIG=yes - ;; - docdir) - QT_INSTALL_DOCS="$VAL" - ;; - headerdir) - QT_INSTALL_HEADERS="$VAL" - ;; - plugindir) - QT_INSTALL_PLUGINS="$VAL" - ;; - datadir) - QT_INSTALL_DATA="$VAL" - ;; - libdir) - QT_INSTALL_LIBS="$VAL" - ;; - qtnamespace) - QT_NAMESPACE="$VAL" - ;; - qtlibinfix) - QT_LIBINFIX="$VAL" - ;; - translationdir) - QT_INSTALL_TRANSLATIONS="$VAL" - ;; - sysconfdir|settingsdir) - QT_INSTALL_SETTINGS="$VAL" - ;; - examplesdir) - QT_INSTALL_EXAMPLES="$VAL" - ;; - demosdir) - QT_INSTALL_DEMOS="$VAL" - ;; - qconfig) - CFG_QCONFIG="$VAL" - ;; - bindir) - QT_INSTALL_BINS="$VAL" - ;; - buildkey) - CFG_USER_BUILD_KEY="$VAL" - ;; - sxe) - CFG_SXE="$VAL" - ;; - 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 - ;; - sse) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_SSE="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - endian) - if [ "$VAL" = "little" ]; then - CFG_ENDIAN="Q_LITTLE_ENDIAN" - elif [ "$VAL" = "big" ]; then - CFG_ENDIAN="Q_BIG_ENDIAN" - else - UNKNOWN_OPT=yes - fi - ;; - host_endian) - if [ "$VAL" = "little" ]; then - CFG_HOST_ENDIAN="Q_LITTLE_ENDIAN" - elif [ "$VAL" = "big" ]; then - CFG_HOST_ENDIAN="Q_BIG_ENDIAN" - else - UNKNOWN_OPT=yes - fi - ;; - armfpa) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_ARMFPA="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - depths) - CFG_QWS_DEPTHS="$VAL" - ;; - opengl) - 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 - QMakeVar add gfx-drivers qvfb - QMakeVar add kbd-drivers qvfb - QMakeVar add mouse-drivers qvfb - CFG_GFX_ON="$CFG_GFX_ON qvfb" - CFG_KBD_ON="$CFG_KBD_ON qvfb" - CFG_MOUSE_ON="$CFG_MOUSE_ON qvfb" - fi - else - UNKNOWN_OPT=yes - fi - ;; - nomake) - CFG_NOBUILD_PARTS="$CFG_NOBUILD_PARTS $VAL" - ;; - make) - CFG_BUILD_PARTS="$CFG_BUILD_PARTS $VAL" - ;; - x11) - if [ "$PLATFORM_MAC" = "yes" ]; then - PLATFORM_MAC=no - elif [ "$PLATFORM_QWS" = "yes" ]; then - PLATFORM_QWS=no - fi - if [ "$CFG_FRAMEWORK" = "auto" ]; then - CFG_FRAMEWORK=no - fi - PLATFORM_X11=yes - ;; - sdk) - if [ "$PLATFORM_MAC" = "yes" ]; then - CFG_SDK="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - dwarf2) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_MAC_DWARF2="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - arch) - if [ "$PLATFORM_MAC" = "yes" ]; then - CFG_MAC_ARCHS="$CFG_MAC_ARCHS $VAL" - else - CFG_ARCH=$VAL - fi - ;; - host-arch) - CFG_HOST_ARCH=$VAL - ;; - universal) - if [ "$PLATFORM_MAC" = "yes" ] && [ "$VAL" = "yes" ]; then - CFG_MAC_ARCHS="$CFG_MAC_ARCHS x86 ppc" - else - 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" - else - UNKNOWN_OPT=yes - fi - ;; - profile) - if [ "$VAL" = "yes" ]; then - CFG_PROFILE=yes - QMakeVar add QMAKE_CFLAGS -pg - QMakeVar add QMAKE_CXXFLAGS -pg - QMakeVar add QMAKE_LFLAGS -pg - QMAKE_VARS="$QMAKE_VARS CONFIG+=nostrip" - else - UNKNOWN_OPT=yes - fi - ;; - exceptions|g++-exceptions) - if [ "$VAL" = "no" ]; then - CFG_EXCEPTIONS=no - elif [ "$VAL" = "yes" ]; then - CFG_EXCEPTIONS=yes - else - UNKNOWN_OPT=yes - fi - ;; - platform) - PLATFORM="$VAL" - # keep compatibility with old platform names - case $PLATFORM in - aix-64) - PLATFORM=aix-xlc-64 - ;; - hpux-o64) - PLATFORM=hpux-acc-o64 - ;; - hpux-n64) - PLATFORM=hpux-acc-64 - ;; - hpux-acc-n64) - PLATFORM=hpux-acc-64 - ;; - irix-n32) - PLATFORM=irix-cc - ;; - irix-64) - PLATFORM=irix-cc-64 - ;; - irix-cc-n64) - PLATFORM=irix-cc-64 - ;; - reliant-64) - PLATFORM=reliant-cds-64 - ;; - solaris-64) - PLATFORM=solaris-cc-64 - ;; - solaris-64) - PLATFORM=solaris-cc-64 - ;; - openunix-cc) - PLATFORM=unixware-cc - ;; - openunix-g++) - PLATFORM=unixware-g++ - ;; - unixware7-cc) - PLATFORM=unixware-cc - ;; - unixware7-g++) - PLATFORM=unixware-g++ - ;; - macx-g++-64) - PLATFORM=macx-g++ - NATIVE_64_ARCH= - case `uname -p` in - i386) NATIVE_64_ARCH="x86_64" ;; - powerpc) NATIVE_64_ARCH="ppc64" ;; - *) echo "WARNING: Can't detect CPU architecture for macx-g++-64" ;; - esac - if [ ! -z "$NATIVE_64_ARCH" ]; then - QTCONFIG_CONFIG="$QTCONFIG_CONFIG $NATIVE_64_ARCH" - CFG_MAC_ARCHS="$CFG_MAC_ARCHS $NATIVE_64_ARCH" - fi - ;; - esac - ;; - xplatform) - XPLATFORM="$VAL" - ;; - debug-and-release) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_DEBUG_RELEASE="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - optimized-qmake) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_RELEASE_QMAKE="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - release) - if [ "$VAL" = "yes" ]; then - CFG_DEBUG=no - elif [ "$VAL" = "no" ]; then - CFG_DEBUG=yes - else - UNKNOWN_OPT=yes - fi - ;; - prefix-install) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_PREFIX_INSTALL="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - 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 - elif [ "$VAL" = "no" ]; then - CFG_SHARED=yes - else - UNKNOWN_OPT=yes - fi - ;; - incremental) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_INCREMENTAL="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - fatal_error) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_CONFIGURE_EXIT_ON_ERROR="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - feature-*) - if [ "$PLATFORM_QWS" = "yes" ]; then - FEATURE=`echo $VAR | sed "s,^[^-]*-\([^-]*\),\1," | tr 'abcdefghijklmnopqrstuvwxyz-' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` - if [ "$VAL" = "no" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_$FEATURE" - elif [ "$VAL" = "yes" ] || [ "$VAL" = "unknown" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_$FEATURE" - else - UNKNOWN_OPT=yes - fi - else - UNKNOWN_OPT=yes - fi - ;; - shared) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_SHARED="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - gif) - [ "$VAL" = "qt" ] && VAL=yes - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_GIF="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - sm) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_SM="$VAL" - else - UNKNOWN_OPT=yes - fi - - ;; - xinerama) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then - CFG_XINERAMA="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - xshape) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_XSHAPE="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - xsync) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_XSYNC="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - xinput) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then - CFG_XINPUT="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - stl) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_STL="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - pch) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_PRECOMPILE="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - separate-debug-info) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_SEPARATE_DEBUG_INFO="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - reduce-exports) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_REDUCE_EXPORTS="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - mmx) - if [ "$VAL" = "no" ]; then - CFG_MMX="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - 3dnow) - if [ "$VAL" = "no" ]; then - CFG_3DNOW="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - sse) - if [ "$VAL" = "no" ]; then - CFG_SSE="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - sse2) - if [ "$VAL" = "no" ]; then - CFG_SSE2="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - iwmmxt) - CFG_IWMMXT="yes" - ;; - reduce-relocations) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_REDUCE_RELOCATIONS="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - freetype) - [ "$VAL" = "qt" ] && VAL=yes - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then - CFG_QWS_FREETYPE="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - zlib) - [ "$VAL" = "qt" ] && VAL=yes - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then - CFG_ZLIB="$VAL" - else - UNKNOWN_OPT=yes - fi - # No longer supported: - #[ "$VAL" = "no" ] && CFG_LIBPNG=no - ;; - sqlite) - if [ "$VAL" = "system" ]; then - CFG_SQLITE=system - else - UNKNOWN_OPT=yes - fi - ;; - libpng) - [ "$VAL" = "yes" ] && VAL=qt - if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then - CFG_LIBPNG="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - libjpeg) - [ "$VAL" = "yes" ] && VAL=qt - if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then - CFG_LIBJPEG="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - libmng) - [ "$VAL" = "yes" ] && VAL=qt - if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then - CFG_LIBMNG="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - libtiff) - [ "$VAL" = "yes" ] && VAL=qt - if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then - CFG_LIBTIFF="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - nas-sound) - if [ "$VAL" = "system" ] || [ "$VAL" = "no" ]; then - CFG_NAS="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - xcursor) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then - CFG_XCURSOR="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - xfixes) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then - CFG_XFIXES="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - xrandr) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then - CFG_XRANDR="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - xrender) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_XRENDER="$VAL" - else - 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" - else - UNKNOWN_OPT=yes - fi - ;; - xkb) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_XKB="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - cups) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_CUPS="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - iconv) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_ICONV="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - glib) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_GLIB="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - gstreamer) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_GSTREAMER="$VAL" - else - 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" - elif [ "$VAL" = "runtime" ]; then - CFG_DBUS="yes" - else - UNKNOWN_OPT=yes - fi - ;; - dbus-linked) - if [ "$VAL" = "yes" ]; then - CFG_DBUS="linked" - else - UNKNOWN_OPT=yes - fi - ;; - nis) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_NIS="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - largefile) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_LARGEFILE="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - openssl) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_OPENSSL="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - openssl-linked) - if [ "$VAL" = "yes" ]; then - CFG_OPENSSL="linked" - else - 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" - else - if [ "$VAL" = "no" ]; then - CFG_XMLPATTERNS="no" - else - UNKNOWN_OPT=yes - 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" - else - if [ "$VAL" = "no" ]; then - CFG_SVG="no" - else - UNKNOWN_OPT=yes - fi - fi - ;; - webkit) - if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then - CFG_WEBKIT="yes" - else - if [ "$VAL" = "no" ]; then - CFG_WEBKIT="no" - else - UNKNOWN_OPT=yes - fi - fi - ;; - confirm-license) - if [ "$VAL" = "yes" ]; then - OPT_CONFIRM_LICENSE="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - h|help) - if [ "$VAL" = "yes" ]; then - OPT_HELP="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - sql-*|gfx-*|decoration-*|kbd-*|mouse-*) - # if Qt style options were used, $VAL can be "no", "qt", or "plugin" - # if autoconf style options were used, $VAL can be "yes" or "no" - [ "$VAL" = "yes" ] && VAL=qt - # now $VAL should be "no", "qt", or "plugin"... double-check - if [ "$VAL" != "no" ] && [ "$VAL" != "qt" ] && [ "$VAL" != "plugin" ]; then - UNKNOWN_OPT=yes - fi - # now $VAL is "no", "qt", or "plugin" - OPT="$VAL" - VAL=`echo $VAR | sed "s,^[^-]*-\([^-]*\).*,\1,"` - VAR=`echo $VAR | sed "s,^\([^-]*\).*,\1,"` - - # Grab the available values - case "$VAR" in - sql) - avail="$CFG_SQL_AVAILABLE" - ;; - gfx) - avail="$CFG_GFX_AVAILABLE" - if [ "$OPT" = "plugin" ]; then - avail="$CFG_GFX_PLUGIN_AVAILABLE" - fi - ;; - decoration) - avail="$CFG_DECORATION_AVAILABLE" - if [ "$OPT" = "plugin" ]; then - avail="$CFG_DECORATION_PLUGIN_AVAILABLE" - fi - ;; - kbd) - avail="$CFG_KBD_AVAILABLE" - if [ "$OPT" = "plugin" ]; then - avail="$CFG_KBD_PLUGIN_AVAILABLE" - fi - ;; - mouse) - avail="$CFG_MOUSE_AVAILABLE" - if [ "$OPT" = "plugin" ]; then - avail="$CFG_MOUSE_PLUGIN_AVAILABLE" - fi - ;; - *) - avail="" - echo "BUG: Unhandled type $VAR used in $CURRENT_OPT" - ;; - esac - - # Check that that user's value is available. - found=no - for d in $avail; do - if [ "$VAL" = "$d" ]; then - found=yes - break - fi - done - [ "$found" = yes ] || ERROR=yes - - if [ "$VAR" = "sql" ]; then - # set the CFG_SQL_driver - eval "CFG_SQL_$VAL=\$OPT" - continue - fi - - if [ "$OPT" = "plugin" ] || [ "$OPT" = "qt" ]; then - if [ "$OPT" = "plugin" ]; then - [ "$VAR" = "decoration" ] && QMakeVar del "${VAR}s" "$VAL" - [ "$VAR" = "decoration" ] && CFG_DECORATION_ON=`echo "${CFG_DECORATION_ON} " | sed "s,${VAL} ,,g"` && CFG_DECORATION_PLUGIN="$CFG_DECORATION_PLUGIN ${VAL}" - [ "$VAR" = "kbd" ] && QMakeVar del "${VAR}s" "$VAL" - [ "$VAR" = "kbd" ] && CFG_KBD_ON=`echo "${CFG_MOUSE_ON} " | sed "s,${VAL} ,,g"` && CFG_KBD_PLUGIN="$CFG_KBD_PLUGIN ${VAL}" - [ "$VAR" = "mouse" ] && QMakeVar del "${VAR}s" "$VAL" - [ "$VAR" = "mouse" ] && CFG_MOUSE_ON=`echo "${CFG_MOUSE_ON} " | sed "s,${VAL} ,,g"` && CFG_MOUSE_PLUGIN="$CFG_MOUSE_PLUGIN ${VAL}" - [ "$VAR" = "gfx" ] && QMakeVar del "${VAR}s" "$VAL" - [ "$VAR" = "gfx" ] && CFG_GFX_ON=`echo "${CFG_GFX_ON} " | sed "s,${VAL} ,,g"` && CFG_GFX_PLUGIN="${CFG_GFX_PLUGIN} ${VAL}" - VAR="${VAR}-${OPT}" - else - if [ "$VAR" = "gfx" ] || [ "$VAR" = "kbd" ] || [ "$VAR" = "decoration" ] || [ "$VAR" = "mouse" ]; then - [ "$VAR" = "gfx" ] && CFG_GFX_ON="$CFG_GFX_ON $VAL" - [ "$VAR" = "kbd" ] && CFG_KBD_ON="$CFG_KBD_ON $VAL" - [ "$VAR" = "decoration" ] && CFG_DECORATION_ON="$CFG_DECORATION_ON $VAL" - [ "$VAR" = "mouse" ] && CFG_MOUSE_ON="$CFG_MOUSE_ON $VAL" - VAR="${VAR}-driver" - fi - fi - QMakeVar add "${VAR}s" "${VAL}" - elif [ "$OPT" = "no" ]; then - PLUG_VAR="${VAR}-plugin" - if [ "$VAR" = "gfx" ] || [ "$VAR" = "kbd" ] || [ "$VAR" = "mouse" ]; then - IN_VAR="${VAR}-driver" - else - IN_VAR="${VAR}" - fi - [ "$VAR" = "decoration" ] && CFG_DECORATION_ON=`echo "${CFG_DECORATION_ON} " | sed "s,${VAL} ,,g"` - [ "$VAR" = "gfx" ] && CFG_GFX_ON=`echo "${CFG_GFX_ON} " | sed "s,${VAL} ,,g"` - [ "$VAR" = "kbd" ] && CFG_KBD_ON=`echo "${CFG_KBD_ON} " | sed "s,${VAL} ,,g"` - [ "$VAR" = "mouse" ] && CFG_MOUSE_ON=`echo "${CFG_MOUSE_ON} " | sed "s,${VAL} ,,g"` - QMakeVar del "${IN_VAR}s" "$VAL" - QMakeVar del "${PLUG_VAR}s" "$VAL" - fi - if [ "$ERROR" = "yes" ]; then - echo "$CURRENT_OPT: unknown argument" - OPT_HELP=yes - fi - ;; - v|verbose) - if [ "$VAL" = "yes" ]; then - if [ "$OPT_VERBOSE" = "$VAL" ]; then # takes two verboses to turn on qmake debugs - QMAKE_SWITCHES="$QMAKE_SWITCHES -d" - else - OPT_VERBOSE=yes - fi - elif [ "$VAL" = "no" ]; then - if [ "$OPT_VERBOSE" = "$VAL" ] && echo "$QMAKE_SWITCHES" | grep ' -d' >/dev/null 2>&1; then - QMAKE_SWITCHES=`echo $QMAKE_SWITCHES | sed "s, -d,,"` - else - OPT_VERBOSE=no - fi - else - UNKNOWN_OPT=yes - fi - ;; - fast) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - OPT_FAST="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - rpath) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_RPATH="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - add_define) - D_FLAGS="$D_FLAGS \"$VAL\"" - ;; - add_ipath) - I_FLAGS="$I_FLAGS -I\"${VAL}\"" - ;; - add_lpath) - L_FLAGS="$L_FLAGS -L\"${VAL}\"" - ;; - add_rpath) - RPATH_FLAGS="$RPATH_FLAGS \"${VAL}\"" - ;; - add_link) - l_FLAGS="$l_FLAGS -l\"${VAL}\"" - ;; - add_fpath) - if [ "$PLATFORM_MAC" = "yes" ]; then - L_FLAGS="$L_FLAGS -F\"${VAL}\"" - I_FLAGS="$I_FLAGS -F\"${VAL}\"" - else - UNKNOWN_OPT=yes - fi - ;; - add_framework) - if [ "$PLATFORM_MAC" = "yes" ]; then - l_FLAGS="$l_FLAGS -framework \"${VAL}\"" - else - UNKNOWN_OPT=yes - fi - ;; - silent) - CFG_SILENT="$VAL" - ;; - phonon) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_PHONON="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - phonon-backend) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_PHONON_BACKEND="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - *) - UNKNOWN_OPT=yes - ;; - esac - if [ "$UNKNOWN_OPT" = "yes" ]; then - echo "${CURRENT_OPT}: invalid command-line switch" - OPT_HELP=yes - ERROR=yes - fi -done - -if [ "$CFG_QCONFIG" != "full" ] && [ "$CFG_QT3SUPPORT" = "yes" ]; then - echo "Warning: '-qconfig $CFG_QCONFIG' will disable the qt3support library." - CFG_QT3SUPPORT="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 -#------------------------------------------------------------------------------- - -# where to find which.. -unixtests="$relpath/config.tests/unix" -mactests="$relpath/config.tests/mac" -WHICH="$unixtests/which.test" - -PERL=`$WHICH perl 2>/dev/null` - -# find out which awk we want to use, prefer gawk, then nawk, then regular awk -AWK= -for e in gawk nawk awk; do - if "$WHICH" $e >/dev/null 2>&1 && ( $e -f /dev/null /dev/null ) >/dev/null 2>&1; then - AWK=$e - break - fi -done - -### skip this if the user just needs help... -if [ "$OPT_HELP" != "yes" ]; then - -# is this a shadow build? -if [ "$OPT_SHADOW" = "maybe" ]; then - OPT_SHADOW=no - if [ "$relpath" != "$outpath" ] && [ '!' -f "$outpath/configure" ]; then - if [ -h "$outpath" ]; then - [ "$relpath" -ef "$outpath" ] || OPT_SHADOW=yes - else - OPT_SHADOW=yes - fi - fi -fi -if [ "$OPT_SHADOW" = "yes" ]; then - if [ -f "$relpath/.qmake.cache" -o -f "$relpath/src/corelib/global/qconfig.h" ]; then - echo >&2 "You cannot make a shadow build from a source tree containing a previous build." - echo >&2 "Cannot proceed." - exit 1 - fi - [ "$OPT_VERBOSE" = "yes" ] && echo "Performing shadow build..." -fi - -if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ] && [ "$CFG_DEBUG_RELEASE" = "yes" ]; then - echo - echo "WARNING: -debug-and-release is not supported anymore on Qt/X11 and Qt for Embedded Linux" - echo "By default, Qt is built in release mode with separate debug information, so" - echo "-debug-and-release is not necessary anymore" - echo -fi - -# detect build style -if [ "$CFG_DEBUG" = "auto" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then - CFG_DEBUG_RELEASE=yes - CFG_DEBUG=yes - elif [ "$CFG_DEV" = "yes" ]; then - CFG_DEBUG_RELEASE=no - CFG_DEBUG=yes - else - CFG_DEBUG_RELEASE=no - CFG_DEBUG=no - fi -fi -if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then - QMAKE_CONFIG="$QMAKE_CONFIG build_all" -fi - -if [ "$CFG_SILENT" = "yes" ]; then - QMAKE_CONFIG="$QMAKE_CONFIG silent" -fi - -# if the source tree is different from the build tree, -# 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 - find "$relpath/qmake" | while read a; do - my_a=`echo "$a" | sed "s,^${relpath}/,${outpath}/,"` - if [ '!' -f "$my_a" ]; then - if [ -d "$a" ]; then - # directories are created... - mkdir -p "$my_a" - else - a_dir=`dirname "$my_a"` - [ -d "$a_dir" ] || mkdir -p "$a_dir" - # ... and files are symlinked - case `basename "$a"` in - *.o|*.d|GNUmakefile*|qmake) - ;; - *) - rm -f "$my_a" - ln -s "$a" "$my_a" - ;; - esac - fi - fi - done - - # make a syncqt script that can be used in the shadow - rm -f "$outpath/bin/syncqt" - if [ -x "$relpath/bin/syncqt" ]; then - mkdir -p "$outpath/bin" - echo "#!/bin/sh" >"$outpath/bin/syncqt" - echo "QTDIR=\"$relpath\"; export QTDIR" >>"$outpath/bin/syncqt" - echo "perl \"$relpath/bin/syncqt\" -outdir \"$outpath\" $*" >>"$outpath/bin/syncqt" - chmod 755 "$outpath/bin/syncqt" - fi - - # symlink the doc directory - rm -rf "$outpath/doc" - ln -s "$relpath/doc" "$outpath/doc" - - # make sure q3porting.xml can be found - mkdir -p "$outpath/tools/porting/src" - rm -f "$outpath/tools/porting/src/q3porting.xml" - ln -s "$relpath/tools/porting/src/q3porting.xml" "$outpath/tools/porting/src" -fi - -# symlink files from src/gui/embedded neccessary to build qvfb -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" - ln -s "${relpath}/src/gui/embedded/${f}" "${dest}" - done -fi - -# symlink fonts to be able to run application from build directory -if [ "$PLATFORM_QWS" = "yes" ] && [ ! -e "${outpath}/lib/fonts" ]; then - if [ "$PLATFORM" = "$XPLATFORM" ]; then - mkdir -p "${outpath}/lib" - ln -s "${relpath}/lib/fonts" "${outpath}/lib/fonts" - fi -fi - -if [ "$OPT_FAST" = "auto" ]; then - if [ '!' -z "$AWK" ] && [ "$CFG_DEV" = "yes" ]; then - OPT_FAST=yes - else - OPT_FAST=no - fi -fi - -# find a make command -if [ -z "$MAKE" ]; then - MAKE= - for mk in make; do - if "$WHICH" $mk >/dev/null 2>&1; then - MAKE=`$WHICH $mk` - break - fi - done - if [ -z "$MAKE" ]; then - echo >&2 "You don't seem to have 'make' or 'gmake' in your PATH." - echo >&2 "Cannot proceed." - exit 1 - fi -fi - -fi ### help - -#------------------------------------------------------------------------------- -# auto-detect all that hasn't been specified in the arguments -#------------------------------------------------------------------------------- - -[ "$PLATFORM_QWS" = "yes" -a "$CFG_EMBEDDED" = "no" ] && CFG_EMBEDDED=auto -if [ "$CFG_EMBEDDED" != "no" ]; then - case "$UNAME_SYSTEM:$UNAME_RELEASE" in - Darwin:*) - [ -z "$PLATFORM" ] && PLATFORM=qws/macx-generic-g++ - if [ -z "$XPLATFORM" ]; then - [ "$CFG_EMBEDDED" = "auto" ] && CFG_EMBEDDED=generic - XPLATFORM="qws/macx-$CFG_EMBEDDED-g++" - fi - ;; - FreeBSD:*) - [ -z "$PLATFORM" ] && PLATFORM=qws/freebsd-generic-g++ - if [ -z "$XPLATFORM" ]; then - [ "$CFG_EMBEDDED" = "auto" ] && CFG_EMBEDDED=generic - XPLATFORM="qws/freebsd-$CFG_EMBEDDED-g++" - fi - ;; - SunOS:5*) - [ -z "$PLATFORM" ] && PLATFORM=qws/solaris-generic-g++ - if [ -z "$XPLATFORM" ]; then - [ "$CFG_EMBEDDED" = "auto" ] && CFG_EMBEDDED=generic - XPLATFORM="qws/solaris-$CFG_EMBEDDED-g++" - fi - ;; - Linux:*) - if [ -z "$PLATFORM" ]; then - case "$UNAME_MACHINE" in - *86) - PLATFORM=qws/linux-x86-g++ - ;; - *86_64) - PLATFORM=qws/linux-x86_64-g++ - ;; - *ppc) - PLATFORM=qws/linux-ppc-g++ - ;; - *) - PLATFORM=qws/linux-generic-g++ - ;; - esac - fi - if [ -z "$XPLATFORM" ]; then - if [ "$CFG_EMBEDDED" = "auto" ]; then - if [ -n "$CFG_ARCH" ]; then - CFG_EMBEDDED=$CFG_ARCH - else - case "$UNAME_MACHINE" in - *86) - CFG_EMBEDDED=x86 - ;; - *86_64) - CFG_EMBEDDED=x86_64 - ;; - *ppc) - CFG_EMBEDDED=ppc - ;; - *) - CFG_EMBEDDED=generic - ;; - esac - fi - fi - XPLATFORM="qws/linux-$CFG_EMBEDDED-g++" - fi - ;; - CYGWIN*:*) - CFG_EMBEDDED=x86 - ;; - *) - echo "Qt for Embedded Linux is not supported on this platform. Disabling." - CFG_EMBEDDED=no - PLATFORM_QWS=no - ;; - esac -fi -if [ -z "$PLATFORM" ]; then - PLATFORM_NOTES= - case "$UNAME_SYSTEM:$UNAME_RELEASE" in - Darwin:*) - if [ "$PLATFORM_MAC" = "yes" ]; then - PLATFORM=macx-g++ - # PLATFORM=macx-xcode - else - PLATFORM=darwin-g++ - fi - ;; - AIX:*) - #PLATFORM=aix-g++ - #PLATFORM=aix-g++-64 - PLATFORM=aix-xlc - #PLATFORM=aix-xlc-64 - PLATFORM_NOTES=" - - Also available for AIX: aix-g++ aix-g++-64 aix-xlc-64 - " - ;; - GNU:*) - PLATFORM=hurd-g++ - ;; - dgux:*) - PLATFORM=dgux-g++ - ;; -# DYNIX/ptx:4*) -# PLATFORM=dynix-g++ -# ;; - ULTRIX:*) - PLATFORM=ultrix-g++ - ;; - FreeBSD:*) - PLATFORM=freebsd-g++ - PLATFORM_NOTES=" - - Also available for FreeBSD: freebsd-icc - " - ;; - OpenBSD:*) - PLATFORM=openbsd-g++ - ;; - NetBSD:*) - PLATFORM=netbsd-g++ - ;; - BSD/OS:*|BSD/386:*) - PLATFORM=bsdi-g++ - ;; - IRIX*:*) - #PLATFORM=irix-g++ - PLATFORM=irix-cc - #PLATFORM=irix-cc-64 - PLATFORM_NOTES=" - - Also available for IRIX: irix-g++ irix-cc-64 - " - ;; - HP-UX:*) - case "$UNAME_MACHINE" in - ia64) - #PLATFORM=hpuxi-acc-32 - PLATFORM=hpuxi-acc-64 - PLATFORM_NOTES=" - - Also available for HP-UXi: hpuxi-acc-32 - " - ;; - *) - #PLATFORM=hpux-g++ - PLATFORM=hpux-acc - #PLATFORM=hpux-acc-64 - #PLATFORM=hpux-cc - #PLATFORM=hpux-acc-o64 - PLATFORM_NOTES=" - - Also available for HP-UX: hpux-g++ hpux-acc-64 hpux-acc-o64 - " - ;; - esac - ;; - OSF1:*) - #PLATFORM=tru64-g++ - PLATFORM=tru64-cxx - PLATFORM_NOTES=" - - Also available for Tru64: tru64-g++ - " - ;; - Linux:*) - case "$UNAME_MACHINE" in - x86_64|s390x|ppc64) - PLATFORM=linux-g++-64 - ;; - *) - PLATFORM=linux-g++ - ;; - esac - PLATFORM_NOTES=" - - Also available for Linux: linux-kcc linux-icc linux-cxx - " - ;; - SunOS:5*) - #PLATFORM=solaris-g++ - PLATFORM=solaris-cc - #PLATFORM=solaris-cc64 - PLATFORM_NOTES=" - - Also available for Solaris: solaris-g++ solaris-cc-64 - " - ;; - ReliantUNIX-*:*|SINIX-*:*) - PLATFORM=reliant-cds - #PLATFORM=reliant-cds-64 - PLATFORM_NOTES=" - - Also available for Reliant UNIX: reliant-cds-64 - " - ;; - CYGWIN*:*) - PLATFORM=cygwin-g++ - ;; - LynxOS*:*) - PLATFORM=lynxos-g++ - ;; - OpenUNIX:*) - #PLATFORM=unixware-g++ - PLATFORM=unixware-cc - PLATFORM_NOTES=" - - Also available for OpenUNIX: unixware-g++ - " - ;; - UnixWare:*) - #PLATFORM=unixware-g++ - PLATFORM=unixware-cc - PLATFORM_NOTES=" - - Also available for UnixWare: unixware-g++ - " - ;; - SCO_SV:*) - #PLATFORM=sco-g++ - PLATFORM=sco-cc - PLATFORM_NOTES=" - - Also available for SCO OpenServer: sco-g++ - " - ;; - UNIX_SV:*) - PLATFORM=unixware-g++ - ;; - *) - if [ "$OPT_HELP" != "yes" ]; then - echo - for p in $PLATFORMS; do - echo " $relconf $* -platform $p" - done - echo >&2 - echo " The build script does not currently recognize all" >&2 - echo " platforms supported by Qt." >&2 - echo " Rerun this script with a -platform option listed to" >&2 - echo " set the system/compiler combination you use." >&2 - echo >&2 - exit 2 - fi - esac -fi - -if [ "$PLATFORM_QWS" = "yes" ]; then - CFG_SM=no - PLATFORMS=`find "$relpath/mkspecs/qws" | sed "s,$relpath/mkspecs/qws/,,"` -else - PLATFORMS=`find "$relpath/mkspecs/" -type f | grep -v qws | sed "s,$relpath/mkspecs/qws/,,"` -fi - -[ -z "$XPLATFORM" ] && XPLATFORM="$PLATFORM" -if [ -d "$PLATFORM" ]; then - QMAKESPEC="$PLATFORM" -else - QMAKESPEC="$relpath/mkspecs/${PLATFORM}" -fi -if [ -d "$XPLATFORM" ]; then - XQMAKESPEC="$XPLATFORM" -else - XQMAKESPEC="$relpath/mkspecs/${XPLATFORM}" -fi -if [ "$PLATFORM" != "$XPLATFORM" ]; then - QT_CROSS_COMPILE=yes - QMAKE_CONFIG="$QMAKE_CONFIG cross_compile" -fi - -if [ "$PLATFORM_MAC" = "yes" ]; then - if [ `basename $QMAKESPEC` = "macx-xcode" ] || [ `basename $XQMAKESPEC` = "macx-xcode" ]; then - echo >&2 - echo " Platform 'macx-xcode' should not be used when building Qt/Mac." >&2 - echo " Please build Qt/Mac with 'macx-g++', then if you would like to" >&2 - echo " use mac-xcode on your application code it can link to a Qt/Mac" >&2 - echo " built with 'macx-g++'" >&2 - echo >&2 - exit 2 - fi -fi - -# check specified platforms are supported -if [ '!' -d "$QMAKESPEC" ]; then - echo - echo " The specified system/compiler is not supported:" - echo - echo " $QMAKESPEC" - echo - echo " Please see the README file for a complete list." - echo - exit 2 -fi -if [ '!' -d "$XQMAKESPEC" ]; then - echo - echo " The specified system/compiler is not supported:" - echo - echo " $XQMAKESPEC" - echo - echo " Please see the README file for a complete list." - echo - exit 2 -fi -if [ '!' -f "${XQMAKESPEC}/qplatformdefs.h" ]; then - echo - echo " The specified system/compiler port is not complete:" - echo - echo " $XQMAKESPEC/qplatformdefs.h" - echo - echo " Please contact qt-bugs@trolltech.com." - echo - exit 2 -fi - -# now look at the configs and figure out what platform we are config'd for -[ "$CFG_EMBEDDED" = "no" ] \ - && [ '!' -z "`getQMakeConf \"$XQMAKESPEC\" | grep QMAKE_LIBS_X11 | awk '{print $3;}'`" ] \ - && PLATFORM_X11=yes -### echo "$XQMAKESPEC" | grep mkspecs/qws >/dev/null 2>&1 && PLATFORM_QWS=yes - -if [ "$UNAME_SYSTEM" = "SunOS" ]; then - # Solaris 2.5 and 2.6 have libposix4, which was renamed to librt for Solaris 7 and up - if echo $UNAME_RELEASE | grep "^5\.[5|6]" >/dev/null 2>&1; then - sed -e "s,-lrt,-lposix4," "$XQMAKESPEC/qmake.conf" > "$XQMAKESPEC/qmake.conf.new" - mv "$XQMAKESPEC/qmake.conf.new" "$XQMAKESPEC/qmake.conf" - fi -fi - -#------------------------------------------------------------------------------- -# determine the system architecture -#------------------------------------------------------------------------------- -if [ "$OPT_VERBOSE" = "yes" ]; then - echo "Determining system architecture... ($UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE)" -fi - -if [ "$CFG_EMBEDDED" != "no" -a "$CFG_EMBEDDED" != "auto" ] && [ -n "$CFG_ARCH" ]; then - if [ "$CFG_ARCH" != "$CFG_EMBEDDED" ]; then - echo "" - echo "You have specified a target architecture with -embedded and -arch." - echo "The two architectures you have specified are different, so we can" - echo "not proceed. Either set both to be the same, or only use -embedded." - echo "" - exit 1 - fi -fi - -if [ -z "${CFG_HOST_ARCH}" ]; then - case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in - IRIX*:*:*) - CFG_HOST_ARCH=`uname -p` - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " SGI ($CFG_HOST_ARCH)" - fi - ;; - SunOS:5*:*) - case "$UNAME_MACHINE" in - sun4u*|sun4v*) - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " Sun SPARC (sparc)" - fi - CFG_HOST_ARCH=sparc - ;; - i86pc) - case "$PLATFORM" in - *-64) - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " 64-bit AMD 80x86 (x86_64)" - fi - CFG_HOST_ARCH=x86_64 - ;; - *) - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " 32-bit Intel 80x86 (i386)" - fi - CFG_HOST_ARCH=i386 - ;; - esac - esac - ;; - Darwin:*:*) - case "$UNAME_MACHINE" in - Power?Macintosh) - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " 32-bit Apple PowerPC (powerpc)" - fi - ;; - x86) - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " 32-bit Intel 80x86 (i386)" - fi - ;; - esac - CFG_HOST_ARCH=macosx - ;; - AIX:*:00????????00) - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " 64-bit IBM PowerPC (powerpc)" - fi - CFG_HOST_ARCH=powerpc - ;; - HP-UX:*:9000*) - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " HP PA-RISC (parisc)" - fi - CFG_HOST_ARCH=parisc - ;; - *:*:i?86) - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " 32-bit Intel 80x86 (i386)" - fi - CFG_HOST_ARCH=i386 - ;; - *:*:x86_64|*:*:amd64) - if [ "$PLATFORM" = "linux-g++-32" -o "$PLATFORM" = "linux-icc-32" ]; then - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " 32 bit on 64-bit AMD 80x86 (i386)" - fi - CFG_HOST_ARCH=i386 - else - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " 64-bit AMD 80x86 (x86_64)" - fi - CFG_HOST_ARCH=x86_64 - fi - ;; - *:*:ppc) - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " 32-bit PowerPC (powerpc)" - fi - CFG_HOST_ARCH=powerpc - ;; - *:*:ppc64) - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " 64-bit PowerPC (powerpc)" - fi - CFG_HOST_ARCH=powerpc - ;; - *:*:s390*) - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " IBM S/390 (s390)" - fi - CFG_HOST_ARCH=s390 - ;; - *:*:arm*) - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " ARM (arm)" - fi - CFG_HOST_ARCH=arm - ;; - Linux:*:sparc*) - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " Linux on SPARC" - fi - CFG_HOST_ARCH=sparc - ;; - *:*:*) - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " Trying '$UNAME_MACHINE'..." - fi - CFG_HOST_ARCH="$UNAME_MACHINE" - ;; - esac -fi - -if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then - if [ -n "$CFG_ARCH" ]; then - CFG_EMBEDDED=$CFG_ARCH - fi - - case "$CFG_EMBEDDED" in - x86) - CFG_ARCH=i386 - ;; - x86_64) - CFG_ARCH=x86_64 - ;; - ipaq|sharp) - CFG_ARCH=arm - ;; - dm7000) - CFG_ARCH=powerpc - ;; - dm800) - CFG_ARCH=mips - ;; - sh4al) - CFG_ARCH=sh4a - ;; - *) - CFG_ARCH="$CFG_EMBEDDED" - ;; - esac -elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then - CFG_ARCH=$CFG_HOST_ARCH -fi - -if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " '$CFG_ARCH' is supported" - fi -else - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " '$CFG_ARCH' is unsupported, using 'generic'" - fi - CFG_ARCH=generic -fi -if [ "$CFG_HOST_ARCH" != "$CFG_ARCH" ]; then - if [ -d "$relpath/src/corelib/arch/$CFG_HOST_ARCH" ]; then - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " '$CFG_HOST_ARCH' is supported" - fi - else - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " '$CFG_HOST_ARCH' is unsupported, using 'generic'" - fi - CFG_HOST_ARCH=generic - fi -fi - -if [ "$OPT_VERBOSE" = "yes" ]; then - echo "System architecture: '$CFG_ARCH'" - if [ "$PLATFORM_QWS" = "yes" ]; then - echo "Host architecture: '$CFG_HOST_ARCH'" - fi -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 [ "$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" - echo >&2 "environment!" - echo >&2 "" - if [ -z "$PKG_CONFIG_PATH" ]; then - echo >&2 "" - echo >&2 "Warning: PKG_CONFIG_PATH has not been set. This could mean" - 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" ] && [ -z "$PKG_CONFIG_SYSROOT_DIR" ]; then - echo >&2 "" - 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 - PKG_CONFIG="" - 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 - CFG_FRAMEWORK="$CFG_SHARED" - elif [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_SHARED" = "no" ]; then - echo - echo "WARNING: Using static linking will disable the use of Mac frameworks." - echo - CFG_FRAMEWORK="no" - fi -else - CFG_FRAMEWORK=no -fi - -QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1` -TEST_COMPILER="$CC" -[ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER - -# auto-detect precompiled header support -if [ "$CFG_PRECOMPILE" = "auto" ]; then - if [ `echo "$CFG_MAC_ARCHS" | wc -w` -gt 1 ]; then - CFG_PRECOMPILE=no - elif "$unixtests/precomp.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then - CFG_PRECOMPILE=no - else - CFG_PRECOMPILE=yes - fi -elif [ "$CFG_PRECOMPILE" = "yes" ] && [ `echo "$CFG_MAC_ARCHS" | wc -w` -gt 1 ]; then - echo - echo "WARNING: Using universal binaries disables precompiled headers." - echo - CFG_PRECOMPILE=no -fi - -#auto-detect DWARF2 on the mac -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 - CFG_SEPARATE_DEBUG_INFO="no" -fi - -# auto-detect support for separate debug info in objcopy -if [ "$CFG_SEPARATE_DEBUG_INFO" != "no" ] && [ "$CFG_SHARED" = "yes" ]; then - TEST_COMPILER_CFLAGS=`getQMakeConf "$XQMAKESPEC" | sed -n -e 's%QMAKE_CFLAGS[^_].*=%%p' | tr '\n' ' '` - TEST_COMPILER_CXXFLAGS=`getQMakeConf "$XQMAKESPEC" | sed -n -e 's%QMAKE_CXXFLAGS[^_].*=%%p' | tr '\n' ' '` - TEST_OBJCOPY=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_OBJCOPY" | sed "s%.* *= *\(.*\)$%\1%" | tail -1` - COMPILER_WITH_FLAGS="$TEST_COMPILER $TEST_COMPILER_CXXFLAGS" - COMPILER_WITH_FLAGS=`echo "$COMPILER_WITH_FLAGS" | sed -e "s%\\$\\$QMAKE_CFLAGS%$TEST_COMPILER_CFLAGS%g"` - if "$unixtests/objcopy.test" "$COMPILER_WITH_FLAGS" "$TEST_OBJCOPY" "$OPT_VERBOSE"; then - CFG_SEPARATE_DEBUG_INFO=no - else - case "$PLATFORM" in - hpux-*) - # binutils on HP-UX is buggy; default to no. - CFG_SEPARATE_DEBUG_INFO=no - ;; - *) - CFG_SEPARATE_DEBUG_INFO=yes - ;; - esac - fi -fi - -# auto-detect -fvisibility support -if [ "$CFG_REDUCE_EXPORTS" = "auto" ]; then - if "$unixtests/fvisibility.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then - CFG_REDUCE_EXPORTS=no - else - CFG_REDUCE_EXPORTS=yes - fi -fi - -# detect the availability of the -Bsymbolic-functions linker optimization -if [ "$CFG_REDUCE_RELOCATIONS" != "no" ]; then - if "$unixtests/bsymbolic_functions.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then - CFG_REDUCE_RELOCATIONS=no - else - CFG_REDUCE_RELOCATIONS=yes - fi -fi - -# auto-detect GNU make support -if [ "$CFG_USE_GNUMAKE" = "auto" ] && "$MAKE" -v | grep "GNU Make" >/dev/null 2>&1; then - 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" ] || [ "$CFG_OPENGL" = "yes" ]; then - CFG_OPENGL=desktop - fi -fi - -# find the default framework value -if [ "$PLATFORM_MAC" = "yes" ] && [ "$PLATFORM" != "macx-xlc" ]; then - if [ "$CFG_FRAMEWORK" = "auto" ]; then - CFG_FRAMEWORK="$CFG_SHARED" - elif [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_SHARED" = "no" ]; then - echo - echo "WARNING: Using static linking will disable the use of Mac frameworks." - echo - CFG_FRAMEWORK="no" - fi -else - CFG_FRAMEWORK=no -fi - -# x11 tests are done after qmake is built - - -#setup the build parts -if [ -z "$CFG_BUILD_PARTS" ]; then - CFG_BUILD_PARTS="$QT_DEFAULT_BUILD_PARTS" - - # don't build tools by default when cross-compiling - if [ "$PLATFORM" != "$XPLATFORM" ]; then - CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"` - fi -fi -for nobuild in $CFG_NOBUILD_PARTS; do - CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, $nobuild,,g"` -done -if echo $CFG_BUILD_PARTS | grep -v libs >/dev/null 2>&1; then -# echo -# echo "WARNING: libs is a required part of the build." -# echo - CFG_BUILD_PARTS="$CFG_BUILD_PARTS libs" -fi - -#------------------------------------------------------------------------------- -# post process QT_INSTALL_* variables -#------------------------------------------------------------------------------- - -#prefix -if [ -z "$QT_INSTALL_PREFIX" ]; then - if [ "$CFG_DEV" = "yes" ]; then - QT_INSTALL_PREFIX="$outpath" # In Qt Development, we use sandboxed builds by default - elif [ "$PLATFORM_QWS" = "yes" ]; then - QT_INSTALL_PREFIX="/usr/local/Trolltech/QtEmbedded-${QT_VERSION}" - if [ "$PLATFORM" != "$XPLATFORM" ]; then - QT_INSTALL_PREFIX="${QT_INSTALL_PREFIX}-${CFG_ARCH}" - fi - else - QT_INSTALL_PREFIX="/usr/local/Trolltech/Qt-${QT_VERSION}" # the default install prefix is /usr/local/Trolltech/Qt-$QT_VERSION - fi -fi -QT_INSTALL_PREFIX=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_PREFIX"` - -#docs -if [ -z "$QT_INSTALL_DOCS" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then - QT_INSTALL_DOCS="/Developer/Documentation/Qt" - fi - fi - [ -z "$QT_INSTALL_DOCS" ] && QT_INSTALL_DOCS="$QT_INSTALL_PREFIX/doc" #fallback - -fi -QT_INSTALL_DOCS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DOCS"` - -#headers -if [ -z "$QT_INSTALL_HEADERS" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then - if [ "$CFG_FRAMEWORK" = "yes" ]; then - QT_INSTALL_HEADERS= - fi - fi - fi - [ -z "$QT_INSTALL_HEADERS" ] && QT_INSTALL_HEADERS="$QT_INSTALL_PREFIX/include" - -fi -QT_INSTALL_HEADERS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_HEADERS"` - -#libs -if [ -z "$QT_INSTALL_LIBS" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then - if [ "$CFG_FRAMEWORK" = "yes" ]; then - QT_INSTALL_LIBS="/Libraries/Frameworks" - fi - fi - fi - [ -z "$QT_INSTALL_LIBS" ] && QT_INSTALL_LIBS="$QT_INSTALL_PREFIX/lib" #fallback -fi -QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"` - -#bins -if [ -z "$QT_INSTALL_BINS" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then - QT_INSTALL_BINS="/Developer/Applications/Qt" - fi - fi - [ -z "$QT_INSTALL_BINS" ] && QT_INSTALL_BINS="$QT_INSTALL_PREFIX/bin" #fallback - -fi -QT_INSTALL_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_BINS"` - -#plugins -if [ -z "$QT_INSTALL_PLUGINS" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then - QT_INSTALL_PLUGINS="/Developer/Applications/Qt/plugins" - fi - fi - [ -z "$QT_INSTALL_PLUGINS" ] && QT_INSTALL_PLUGINS="$QT_INSTALL_PREFIX/plugins" #fallback -fi -QT_INSTALL_PLUGINS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_PLUGINS"` - -#data -if [ -z "$QT_INSTALL_DATA" ]; then #default - QT_INSTALL_DATA="$QT_INSTALL_PREFIX" -fi -QT_INSTALL_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DATA"` - -#translations -if [ -z "$QT_INSTALL_TRANSLATIONS" ]; then #default - QT_INSTALL_TRANSLATIONS="$QT_INSTALL_PREFIX/translations" -fi -QT_INSTALL_TRANSLATIONS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_TRANSLATIONS"` - -#settings -if [ -z "$QT_INSTALL_SETTINGS" ]; then #default - if [ "$PLATFORM_MAC" = "yes" ]; then - QT_INSTALL_SETTINGS=/Library/Preferences/Qt - else - QT_INSTALL_SETTINGS=/etc/xdg - fi -fi -QT_INSTALL_SETTINGS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_SETTINGS"` - -#examples -if [ -z "$QT_INSTALL_EXAMPLES" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then - QT_INSTALL_EXAMPLES="/Developer/Examples/Qt" - fi - fi - [ -z "$QT_INSTALL_EXAMPLES" ] && QT_INSTALL_EXAMPLES="$QT_INSTALL_PREFIX/examples" #fallback -fi -QT_INSTALL_EXAMPLES=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_EXAMPLES"` - -#demos -if [ -z "$QT_INSTALL_DEMOS" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then - QT_INSTALL_DEMOS="/Developer/Examples/Qt/Demos" - fi - fi - [ -z "$QT_INSTALL_DEMOS" ] && QT_INSTALL_DEMOS="$QT_INSTALL_PREFIX/demos" -fi -QT_INSTALL_DEMOS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DEMOS"` - -#------------------------------------------------------------------------------- -# help - interactive parts of the script _after_ this section please -#------------------------------------------------------------------------------- - -# next, emit a usage message if something failed. -if [ "$OPT_HELP" = "yes" ]; then - [ "x$ERROR" = "xyes" ] && echo - if [ "$CFG_NIS" = "no" ]; then - NSY=" " - NSN="*" - else - NSY="*" - NSN=" " - fi - if [ "$CFG_CUPS" = "no" ]; then - CUY=" " - CUN="*" - else - CUY="*" - CUN=" " - fi - if [ "$CFG_ICONV" = "no" ]; then - CIY=" " - CIN="*" - else - CIY="*" - CIN=" " - fi - if [ "$CFG_LARGEFILE" = "no" ]; then - LFSY=" " - LFSN="*" - else - LFSY="*" - LFSN=" " - fi - if [ "$CFG_STL" = "auto" ] || [ "$CFG_STL" = "yes" ]; then - SHY="*" - SHN=" " - else - SHY=" " - SHN="*" - fi - if [ "$CFG_IPV6" = "auto" ]; then - I6Y="*" - I6N=" " - fi - if [ "$CFG_PRECOMPILE" = "auto" ] || [ "$CFG_PRECOMPILE" = "no" ]; then - PHY=" " - PHN="*" - else - PHY="*" - PHN=" " - fi - - cat <<EOF -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] [-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] [-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>] [-qtlibinfix <infix>] [-separate-debug-info] [-armfpa] - [-no-optimized-qmake] [-optimized-qmake] [-no-xmlpatterns] [-xmlpatterns] - [-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)] - - -Installation options: - - These are optional, but you may specify install directories. - - -prefix <dir> ...... This will install everything relative to <dir> - (default $QT_INSTALL_PREFIX) -EOF -if [ "$PLATFORM_QWS" = "yes" ]; then -cat <<EOF - - -hostprefix [dir] .. Tools and libraries needed when developing - applications are installed in [dir]. If [dir] is - not given, the current build directory will be used. -EOF -fi -cat <<EOF - - * -prefix-install .... Force a sandboxed "local" installation of - Qt. This will install into - $QT_INSTALL_PREFIX, if this option is - disabled then some platforms will attempt a - "system" install by placing default values to - be placed in a system location other than - PREFIX. - - You may use these to separate different parts of the install: - - -bindir <dir> ......... Executables will be installed to <dir> - (default PREFIX/bin) - -libdir <dir> ......... Libraries will be installed to <dir> - (default PREFIX/lib) - -docdir <dir> ......... Documentation will be installed to <dir> - (default PREFIX/doc) - -headerdir <dir> ...... Headers will be installed to <dir> - (default PREFIX/include) - -plugindir <dir> ...... Plugins will be installed to <dir> - (default PREFIX/plugins) - -datadir <dir> ........ Data used by Qt programs will be installed to <dir> - (default PREFIX) - -translationdir <dir> . Translations of Qt programs will be installed to <dir> - (default PREFIX/translations) - -sysconfdir <dir> ..... Settings used by Qt programs will be looked for in <dir> - (default PREFIX/etc/settings) - -examplesdir <dir> .... Examples will be installed to <dir> - (default PREFIX/examples) - -demosdir <dir> ....... Demos will be installed to <dir> - (default PREFIX/demos) - - You may use these options to turn on strict plugin loading. - - -buildkey <key> .... Build the Qt library and plugins using the specified - <key>. When the library loads plugins, it will only - load those that have a matching key. - -Configure options: - - The defaults (*) are usually acceptable. A plus (+) denotes a default value - that needs to be evaluated. If the evaluation succeeds, the feature is - included. Here is a short explanation of each option: - - * -release ........... Compile and link Qt with debugging turned off. - -debug ............. Compile and link Qt with debugging turned on. - -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. - - * -no-fast ........... Configure Qt normally by generating Makefiles for all - project files. - -fast .............. Configure Qt quickly by generating Makefiles only for - library and subdirectory targets. All other Makefiles - are created as wrappers, which will in turn run qmake. - - -no-largefile ...... Disables large file support. - + -largefile ......... Enables Qt to access files larger than 4 GB. - -EOF -if [ "$PLATFORM_QWS" = "yes" ]; then - EXCN="*" - EXCY=" " -else - EXCN=" " - EXCY="*" -fi -if [ "$CFG_DBUS" = "no" ]; then - DBY=" " - DBN="+" -else - DBY="+" - DBN=" " -fi - - cat << EOF - $EXCN -no-exceptions ..... Disable exceptions on compilers that support it. - $EXCY -exceptions ........ Enable exceptions on compilers that support it. - - -no-accessibility .. Do not compile Accessibility support. - * -accessibility ..... Compile Accessibility support. - - $SHN -no-stl ............ Do not compile STL support. - $SHY -stl ............... Compile STL support. - - -no-sql-<driver> ... Disable SQL <driver> entirely. - -qt-sql-<driver> ... Enable a SQL <driver> in the QtSql library, by default - none are turned on. - -plugin-sql-<driver> Enable SQL <driver> as a plugin to be linked to - at run time. - - Possible values for <driver>: - [ $CFG_SQL_AVAILABLE ] - - -system-sqlite ..... Use sqlite from the operating system. - - -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. - QtXmlPatterns is built if a decent C++ compiler - is used and exceptions are enabled. - - -no-phonon ......... Do not build the Phonon module. - + -phonon ............ Build the Phonon module. - Phonon is built if a decent C++ compiler is used. - -no-phonon-backend.. Do not build the platform phonon plugin. - + -phonon-backend..... Build the platform phonon plugin. - - -no-svg ............ Do not build the SVG module. - + -svg ............... Build the SVG module. - - -no-webkit ......... Do not build the WebKit module. - + -webkit ............ Build the WebKit module. - WebKit is built if a decent C++ compiler is used. - - -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. - -no-sse ............ Do not compile with use of SSE instructions. - -no-sse2 ........... Do not compile with use of SSE2 instructions. - - -qtnamespace <name> Wraps all Qt library code in 'namespace <name> {...}'. - -qtlibinfix <infix> Renames all libQt*.so to libQt*<infix>.so. - - -D <string> ........ Add an explicit define to the preprocessor. - -I <string> ........ Add an explicit include path. - -L <string> ........ Add an explicit library path. - - -help, -h .......... Display this information. - -Third Party Libraries: - - -qt-zlib ........... Use the zlib bundled with Qt. - + -system-zlib ....... Use zlib from the operating system. - See http://www.gzip.org/zlib - - -no-gif ............ Do not compile the plugin for GIF reading support. - * -qt-gif ............ Compile the plugin for GIF reading support. - See also src/plugins/imageformats/gif/qgifhandler.h - - -no-libtiff ........ Do not compile the plugin for TIFF support. - -qt-libtiff ........ Use the libtiff bundled with Qt. - + -system-libtiff .... Use libtiff from the operating system. - See http://www.libtiff.org - - -no-libpng ......... Do not compile in PNG support. - -qt-libpng ......... Use the libpng bundled with Qt. - + -system-libpng ..... Use libpng from the operating system. - See http://www.libpng.org/pub/png - - -no-libmng ......... Do not compile the plugin for MNG support. - -qt-libmng ......... Use the libmng bundled with Qt. - + -system-libmng ..... Use libmng from the operating system. - See http://www.libmng.com - - -no-libjpeg ........ Do not compile the plugin for JPEG support. - -qt-libjpeg ........ Use the libjpeg bundled with Qt. - + -system-libjpeg .... Use libjpeg from the operating system. - See http://www.ijg.org - - -no-openssl ........ Do not compile support for OpenSSL. - + -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. - ($QT_DEFAULT_BUILD_PARTS) - -nomake <part> ..... Exclude part from the list of parts to be built. - - -R <string> ........ Add an explicit runtime library path to the Qt - libraries. - -l <string> ........ Add an explicit library. - - -no-rpath .......... Do not use the library install path as a runtime - library path. - + -rpath ............. Link Qt libraries and executables using the library - install path as a runtime library path. Equivalent - to -R install_libpath - - -continue .......... Continue as far as possible if an error occurs. - - -verbose, -v ....... Print verbose information about each step of the - configure process. - - -silent ............ Reduce the build output so that warnings and errors - can be seen more easily. - - * -no-optimized-qmake ... Do not build qmake optimized. - -optimized-qmake ...... Build qmake optimized. - - $NSN -no-nis ............ Do not compile NIS support. - $NSY -nis ............... Compile NIS support. - - $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). - - $PHN -no-pch ............ Do not use precompiled header support. - $PHY -pch ............... Use precompiled header support. - - $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. - - -reduce-relocations ..... Reduce relocations in the libraries through extra - linker optimizations (Qt/X11 and Qt for Embedded Linux only; - experimental; needs GNU ld >= 2.18). -EOF - -if [ "$CFG_SEPARATE_DEBUG_INFO" = "auto" ]; then - if [ "$QT_CROSS_COMPILE" = "yes" ]; then - SBY="" - SBN="*" - else - SBY="*" - SBN=" " - fi -elif [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then - SBY="*" - SBN=" " -else - SBY=" " - SBN="*" -fi - -if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then - - cat << EOF - - $SBN -no-separate-debug-info . Do not store debug information in a separate file. - $SBY -separate-debug-info .... Strip debug information into a separate .debug file. - -EOF - -fi # X11/QWS - -if [ "$PLATFORM_X11" = "yes" ]; then - if [ "$CFG_SM" = "no" ]; then - SMY=" " - SMN="*" - else - SMY="*" - SMN=" " - fi - if [ "$CFG_XSHAPE" = "no" ]; then - SHY=" " - SHN="*" - else - SHY="*" - SHN=" " - fi - if [ "$CFG_XINERAMA" = "no" ]; then - XAY=" " - XAN="*" - else - XAY="*" - XAN=" " - fi - if [ "$CFG_FONTCONFIG" = "no" ]; then - FCGY=" " - FCGN="*" - else - FCGY="*" - FCGN=" " - fi - if [ "$CFG_XCURSOR" = "no" ]; then - XCY=" " - XCN="*" - else - XCY="*" - XCN=" " - fi - if [ "$CFG_XFIXES" = "no" ]; then - XFY=" " - XFN="*" - else - XFY="*" - XFN=" " - fi - if [ "$CFG_XRANDR" = "no" ]; then - XZY=" " - XZN="*" - else - XZY="*" - XZN=" " - fi - if [ "$CFG_XRENDER" = "no" ]; then - XRY=" " - XRN="*" - else - XRY="*" - XRN=" " - fi - if [ "$CFG_MITSHM" = "no" ]; then - XMY=" " - XMN="*" - else - XMY="*" - XMN=" " - fi - if [ "$CFG_XINPUT" = "no" ]; then - XIY=" " - XIN="*" - else - XIY="*" - XIN=" " - fi - if [ "$CFG_XKB" = "no" ]; then - XKY=" " - XKN="*" - else - XKY="*" - XKN=" " - fi - if [ "$CFG_IM" = "no" ]; then - IMY=" " - IMN="*" - else - IMY="*" - IMN=" " - fi - cat << EOF - -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 <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. - - $SHN -no-xshape ......... Do not compile XShape support. - $SHY -xshape ............ Compile XShape support. - Requires X11/extensions/shape.h. - - $SHN -no-xsync .......... Do not compile XSync support. - $SHY -xsync ............. Compile XSync support. - Requires X11/extensions/sync.h. - - $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 - loaded at runtime. - - $XCN -no-xcursor ........ Do not compile Xcursor support. - $XCY -xcursor ........... Compile Xcursor support. - Requires X11/Xcursor/Xcursor.h and libXcursor. - By default, Xcursor support will be compiled if - available and the shared libraries are dynamically - loaded at runtime. - - $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 - loaded at runtime. - - $XZN -no-xrandr ......... Do not compile Xrandr (resize and rotate) support. - $XZY -xrandr ............ Compile Xrandr support. - Requires X11/extensions/Xrandr.h and libXrandr. - - $XRN -no-xrender ........ Do not compile Xrender support. - $XRY -xrender ........... Compile Xrender support. - 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-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. - $XKY -xkb ............... Compile XKB support. - -EOF -fi - -if [ "$PLATFORM_MAC" = "yes" ]; then - cat << EOF - -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. - - -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. - -EOF -fi - -if [ "$PLATFORM_QWS" = "yes" ]; then - cat << EOF - -Qt for Embedded Linux only: - - -xplatform target ... The target platform when cross-compiling. - - -no-feature-<feature> Do not compile in <feature>. - -feature-<feature> .. Compile in <feature>. The available features - are described in src/corelib/global/qfeatures.txt - - -embedded <arch> .... This will enable the embedded build, you must have a - proper license for this switch to work. - Example values for <arch>: arm mips x86 generic - - -armfpa ............. Target platform is uses the ARM-FPA floating point format. - -no-armfpa .......... Target platform does not use the ARM-FPA floating point format. - - The floating point format is usually autodetected by configure. Use this - to override the detected value. - - -little-endian ...... Target platform is little endian (LSB first). - -big-endian ......... Target platform is big endian (MSB first). - - -host-little-endian . Host platform is little endian (LSB first). - -host-big-endian .... Host platform is big endian (MSB first). - - You only need to specify the endianness when - cross-compiling, otherwise the host - endianness will be used. - - -no-freetype ........ Do not compile in Freetype2 support. - -qt-freetype ........ Use the libfreetype bundled with Qt. - * -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 - default ($CFG_QCONFIG). - - -depths <list> ...... Comma-separated list of supported bit-per-pixel - depths, from: 1, 4, 8, 12, 15, 16, 18, 24, 32 and 'all'. - - -qt-decoration-<style> ....Enable a decoration <style> in the QtGui library, - by default all available decorations are on. - Possible values for <style>: [ $CFG_DECORATION_AVAILABLE ] - -plugin-decoration-<style> Enable decoration <style> as a plugin to be - linked to at run time. - Possible values for <style>: [ $CFG_DECORATION_PLUGIN_AVAILABLE ] - -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 - linked to at run time. - Possible values for <driver>: [ $CFG_GFX_PLUGIN_AVAILABLE ] - -no-gfx-<driver> ... Disable graphics <driver> entirely. - Possible values for <driver>: [ $CFG_GFX_AVAILABLE ] - - -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 - at runtime. - Possible values for <driver>: [ $CFG_KBD_PLUGIN_AVAILABLE ] - - -no-kbd-<driver> ... Disable keyboard <driver> entirely. - Possible values for <driver>: [ $CFG_KBD_AVAILABLE ] - - -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 - at runtime. - Possible values for <driver>: [ $CFG_MOUSE_PLUGIN_AVAILABLE ] - -no-mouse-<driver> ... Disable mouse <driver> entirely. - Possible values for <driver>: [ $CFG_MOUSE_AVAILABLE ] - - -iwmmxt ............ Compile using the iWMMXt instruction set - (available on some XScale CPUs). - -EOF -fi - - -if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_X11" = "yes" ]; then - if [ "$CFG_GLIB" = "no" ]; then - GBY=" " - GBN="+" - else - GBY="+" - GBN=" " - fi - cat << EOF - $GBN -no-glib ........... Do not compile Glib support. - $GBY -glib .............. Compile Glib support. - -EOF -fi - - [ "x$ERROR" = "xyes" ] && exit 1 - exit 0 -fi # Help - - -# ----------------------------------------------------------------------------- -# LICENSING, INTERACTIVE PART -# ----------------------------------------------------------------------------- - -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 - echo "You are licensed to use this software under the terms of" - echo "the Lesser GNU General Public License (LGPL) versions 2.1." - if [ -f "$relpath/LICENSE.GPL3" ]; then - echo "You are also licensed to use this software under the terms of" - echo "the GNU General Public License (GPL) versions 3." - affix="either" - else - affix="the" - fi - echo - if [ "$OPT_CONFIRM_LICENSE" = "yes" ]; then - echo "You have already accepted the terms of the $LicenseType license." - acceptance=yes - else - if [ -f "$relpath/LICENSE.GPL3" ]; then - echo "Type '3' to view the GNU General Public License version 3." - fi - 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 - if echo '\c' | grep '\c' >/dev/null; then - echo -n "Do you accept the terms of $affix license? " - else - echo "Do you accept the terms of $affix 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 1 - 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 [ "$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 - echo "Type '?' to read the Preview License." - 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.PREVIEW.COMMERCIAL" - fi - done -elif [ "$Edition" != "OpenSource" ]; then - if [ -n "$ExpiryDate" ]; then - ExpiryDate=`echo $ExpiryDate | sed -e "s,-,,g" | tr -d "\n\r"` - [ -z "$ExpiryDate" ] && ExpiryDate="0" - Today=`date +%Y%m%d` - if [ "$Today" -gt "$ExpiryDate" ]; then - case "$LicenseType" in - Commercial|Academic|Educational) - if [ "$QT_PACKAGEDATE" -gt "$ExpiryDate" ]; then - echo - echo "NOTICE NOTICE NOTICE NOTICE" - echo - echo " Your support and upgrade period has expired." - echo - echo " You are no longer licensed to use this version of Qt." - echo " Please contact qt-info@nokia.com to renew your support" - echo " and upgrades for this license." - echo - echo "NOTICE NOTICE NOTICE NOTICE" - echo - exit 1 - else - echo - echo "WARNING WARNING WARNING WARNING" - echo - echo " Your support and upgrade period has expired." - echo - echo " You may continue to use your last licensed release" - echo " of Qt under the terms of your existing license" - echo " agreement. But you are not entitled to technical" - echo " support, nor are you entitled to use any more recent" - echo " Qt releases." - echo - echo " Please contact qt-info@nokia.com to renew your" - echo " support and upgrades for this license." - echo - echo "WARNING WARNING WARNING WARNING" - echo - sleep 3 - fi - ;; - Evaluation|*) - echo - echo "NOTICE NOTICE NOTICE NOTICE" - echo - echo " Your Evaluation license has expired." - echo - echo " You are no longer licensed to use this software. Please" - echo " contact qt-info@nokia.com to purchase license, or install" - echo " the Qt Open Source Edition if you intend to develop free" - echo " software." - echo - echo "NOTICE NOTICE NOTICE NOTICE" - echo - exit 1 - ;; - esac - fi - fi - TheLicense=`head -n 1 "$outpath/LICENSE"` - while true; do - if [ "$OPT_CONFIRM_LICENSE" = "yes" ]; then - echo "You have already accepted the terms of the $TheLicense." - acceptance=yes - else - echo "You are licensed to use this software under the terms of" - echo "the $TheLicense." - echo - echo "Type '?' to view 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 $TheLicense? " - else - echo "Do you accept the terms of the $TheLicense? \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 1 - else [ "$acceptance" = "?" ] - more "$outpath/LICENSE" - fi - done -fi - -# this should be moved somewhere else -case "$PLATFORM" in -aix-*) - AIX_VERSION=`uname -v` - if [ "$AIX_VERSION" -lt "5" ]; then - QMakeVar add QMAKE_LIBS_X11 -lbind - fi - ;; -*) - ;; -esac - -#------------------------------------------------------------------------------- -# generate qconfig.cpp -#------------------------------------------------------------------------------- -[ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global" - -LICENSE_USER_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_lcnsuser=$Licensee"` -LICENSE_PRODUCTS_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_lcnsprod=$Edition"` -PREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_INSTALL_PREFIX"` -DOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_INSTALL_DOCS"` -HEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_INSTALL_HEADERS"` -LIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_INSTALL_LIBS"` -BINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_INSTALL_BINS"` -PLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_INSTALL_PLUGINS"` -DATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_INSTALL_DATA"` -TRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_INSTALL_TRANSLATIONS"` -SETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS"` -EXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES"` -DEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS"` - -cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF -/* License Info */ -static const char qt_configure_licensee_str [256 + 12] = "$LICENSE_USER_STR"; -static const char qt_configure_licensed_products_str [256 + 12] = "$LICENSE_PRODUCTS_STR"; -EOF - -if [ ! -z "$QT_HOST_PREFIX" ]; then - HOSTPREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_HOST_PREFIX"` - HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"` - HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"` - HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/lib"` - HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/bin"` - HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"` - HOSTDATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_HOST_PREFIX"` - HOSTTRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_HOST_PREFIX/translations"` - HOSTSETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS"` - HOSTEXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES"` - HOSTDEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS"` - - cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF - -#if defined(QT_BOOTSTRAPPED) || defined(QT_BUILD_QMAKE) -/* Installation Info */ -static const char qt_configure_prefix_path_str [256 + 12] = "$HOSTPREFIX_PATH_STR"; -static const char qt_configure_documentation_path_str[256 + 12] = "$HOSTDOCUMENTATION_PATH_STR"; -static const char qt_configure_headers_path_str [256 + 12] = "$HOSTHEADERS_PATH_STR"; -static const char qt_configure_libraries_path_str [256 + 12] = "$HOSTLIBRARIES_PATH_STR"; -static const char qt_configure_binaries_path_str [256 + 12] = "$HOSTBINARIES_PATH_STR"; -static const char qt_configure_plugins_path_str [256 + 12] = "$HOSTPLUGINS_PATH_STR"; -static const char qt_configure_data_path_str [256 + 12] = "$HOSTDATA_PATH_STR"; -static const char qt_configure_translations_path_str [256 + 12] = "$HOSTTRANSLATIONS_PATH_STR"; -static const char qt_configure_settings_path_str [256 + 12] = "$HOSTSETTINGS_PATH_STR"; -static const char qt_configure_examples_path_str [256 + 12] = "$HOSTEXAMPLES_PATH_STR"; -static const char qt_configure_demos_path_str [256 + 12] = "$HOSTDEMOS_PATH_STR"; -#else // QT_BOOTSTRAPPED -EOF -fi - -cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF -/* Installation Info */ -static const char qt_configure_prefix_path_str [256 + 12] = "$PREFIX_PATH_STR"; -static const char qt_configure_documentation_path_str[256 + 12] = "$DOCUMENTATION_PATH_STR"; -static const char qt_configure_headers_path_str [256 + 12] = "$HEADERS_PATH_STR"; -static const char qt_configure_libraries_path_str [256 + 12] = "$LIBRARIES_PATH_STR"; -static const char qt_configure_binaries_path_str [256 + 12] = "$BINARIES_PATH_STR"; -static const char qt_configure_plugins_path_str [256 + 12] = "$PLUGINS_PATH_STR"; -static const char qt_configure_data_path_str [256 + 12] = "$DATA_PATH_STR"; -static const char qt_configure_translations_path_str [256 + 12] = "$TRANSLATIONS_PATH_STR"; -static const char qt_configure_settings_path_str [256 + 12] = "$SETTINGS_PATH_STR"; -static const char qt_configure_examples_path_str [256 + 12] = "$EXAMPLES_PATH_STR"; -static const char qt_configure_demos_path_str [256 + 12] = "$DEMOS_PATH_STR"; -EOF - -if [ ! -z "$QT_HOST_PREFIX" ]; then - cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF -#endif // QT_BOOTSTRAPPED - -EOF -fi - -cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF -/* strlen( "qt_lcnsxxxx" ) == 12 */ -#define QT_CONFIGURE_LICENSEE qt_configure_licensee_str + 12; -#define QT_CONFIGURE_LICENSED_PRODUCTS qt_configure_licensed_products_str + 12; -#define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12; -#define QT_CONFIGURE_DOCUMENTATION_PATH qt_configure_documentation_path_str + 12; -#define QT_CONFIGURE_HEADERS_PATH qt_configure_headers_path_str + 12; -#define QT_CONFIGURE_LIBRARIES_PATH qt_configure_libraries_path_str + 12; -#define QT_CONFIGURE_BINARIES_PATH qt_configure_binaries_path_str + 12; -#define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12; -#define QT_CONFIGURE_DATA_PATH qt_configure_data_path_str + 12; -#define QT_CONFIGURE_TRANSLATIONS_PATH qt_configure_translations_path_str + 12; -#define QT_CONFIGURE_SETTINGS_PATH qt_configure_settings_path_str + 12; -#define QT_CONFIGURE_EXAMPLES_PATH qt_configure_examples_path_str + 12; -#define QT_CONFIGURE_DEMOS_PATH qt_configure_demos_path_str + 12; -EOF - -# avoid unecessary rebuilds by copying only if qconfig.cpp has changed -if cmp -s "$outpath/src/corelib/global/qconfig.cpp" "$outpath/src/corelib/global/qconfig.cpp.new"; then - rm -f "$outpath/src/corelib/global/qconfig.cpp.new" -else - [ -f "$outpath/src/corelib/global/qconfig.cpp" ] && chmod +w "$outpath/src/corelib/global/qconfig.cpp" - mv "$outpath/src/corelib/global/qconfig.cpp.new" "$outpath/src/corelib/global/qconfig.cpp" - chmod -w "$outpath/src/corelib/global/qconfig.cpp" -fi - -# ----------------------------------------------------------------------------- -# build qmake -# ----------------------------------------------------------------------------- - -# symlink includes -if [ -n "$PERL" ] && [ -x "$relpath/bin/syncqt" ]; then - SYNCQT_OPTS= - [ "$CFG_DEV" = "yes" ] && SYNCQT_OPTS="$SYNCQT_OPTS -check-includes" - if [ "$OPT_SHADOW" = "yes" ]; then - "$outpath/bin/syncqt" $SYNCQT_OPTS - elif [ "$CFG_DEV" = "yes" ] || [ ! -d $relpath/include ]; then - QTDIR="$relpath" perl "$outpath/bin/syncqt" $SYNCQT_OPTS - fi -fi - -# $1: variable name -# $2: optional transformation -# relies on $QMAKESPEC, $COMPILER_CONF and $mkfile being set correctly, as the latter -# is where the resulting variable is written to -setBootstrapVariable() -{ - variableRegExp="^$1[^_A-Z0-9]" - getQMakeConf | grep "$variableRegExp" | ( [ -n "$2" ] && sed "$2" ; [ -z "$2" ] && cat ) | $AWK ' -{ - varLength = index($0, "=") - 1 - valStart = varLength + 2 - if (substr($0, varLength, 1) == "+") { - varLength = varLength - 1 - valStart = valStart + 1 - } - var = substr($0, 0, varLength) - gsub("[ \t]+", "", var) - val = substr($0, valStart) - printf "%s_%s = %s\n", var, NR, val -} -END { - if (length(var) > 0) { - printf "%s =", var - for (i = 1; i <= NR; ++i) - printf " $(%s_%s)", var, i - printf "\n" - } -}' >> "$mkfile" -} - -# build qmake -if false; then ###[ '!' -f "$outpath/bin/qmake" ]; - echo "Creating qmake. Please wait..." - - OLD_QCONFIG_H= - QCONFIG_H="$outpath/src/corelib/global/qconfig.h" - QMAKE_QCONFIG_H="${QCONFIG_H}.qmake" - if [ -f "$QCONFIG_H" ]; then - OLD_QCONFIG_H=$QCONFIG_H - mv -f "$OLD_QCONFIG_H" "${OLD_QCONFIG_H}.old" - fi - - # create temporary qconfig.h for compiling qmake, if it doesn't exist - # when building qmake, we use #defines for the install paths, - # however they are real functions in the library - if [ '!' -f "$QMAKE_QCONFIG_H" ]; then - mkdir -p "$outpath/src/corelib/global" - [ -f "$QCONFIG_H" ] && chmod +w "$QCONFIG_H" - echo "/* All features enabled while building qmake */" >"$QMAKE_QCONFIG_H" - fi - - mv -f "$QMAKE_QCONFIG_H" "$QCONFIG_H" - for conf in "$outpath/include/QtCore/qconfig.h" "$outpath/include/Qt/qconfig.h"; do - if [ '!' -f "$conf" ]; then - ln -s "$QCONFIG_H" "$conf" - fi - done - - #mkspecs/default is used as a (gasp!) default mkspec so QMAKESPEC needn't be set once configured - rm -f mkspecs/default - ln -s `echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default - # fix makefiles - for mkfile in GNUmakefile Makefile; do - EXTRA_LFLAGS= - EXTRA_CFLAGS= - in_mkfile="${mkfile}.in" - if [ "$mkfile" = "Makefile" ]; then -# if which qmake >/dev/null 2>&1 && [ -f qmake/qmake.pro ]; then -# (cd qmake && qmake) >/dev/null 2>&1 && continue -# fi - in_mkfile="${mkfile}.unix" - fi - in_mkfile="$relpath/qmake/$in_mkfile" - mkfile="$outpath/qmake/$mkfile" - if [ -f "$mkfile" ]; then - [ "$CFG_DEV" = "yes" ] && "$WHICH" chflags >/dev/null 2>&1 && chflags nouchg "$mkfile" - rm -f "$mkfile" - fi - [ -f "$in_mkfile" ] || continue - - echo "########################################################################" >$mkfile - echo "## This file was autogenerated by configure, all changes will be lost ##" >>$mkfile - echo "########################################################################" >>$mkfile - EXTRA_OBJS= - EXTRA_SRCS= - EXTRA_CFLAGS="\$(QMAKE_CFLAGS)" - EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS)" - EXTRA_LFLAGS="\$(QMAKE_LFLAGS)" - - if [ "$PLATFORM" = "irix-cc" ] || [ "$PLATFORM" = "irix-cc-64" ]; then - EXTRA_LFLAGS="$EXTRA_LFLAGS -lm" - fi - - [ -n "$CC" ] && echo "CC = $CC" >>$mkfile - [ -n "$CXX" ] && echo "CXX = $CXX" >>$mkfile - if [ "$CFG_SILENT" = "yes" ]; then - [ -z "$CC" ] && setBootstrapVariable QMAKE_CC 's,QMAKE_CC.*=,CC=\@,' - [ -z "$CXX" ] && setBootstrapVariable QMAKE_CXX 's,QMAKE_CXX.*=,CXX=\@,' - else - [ -z "$CC" ] && setBootstrapVariable QMAKE_CC 's,QMAKE_CC,CC,' - [ -z "$CXX" ] && setBootstrapVariable QMAKE_CXX 's,QMAKE_CXX,CXX,' - fi - setBootstrapVariable QMAKE_CFLAGS - setBootstrapVariable QMAKE_CXXFLAGS 's,\$\$QMAKE_CFLAGS,\$(QMAKE_CFLAGS),' - setBootstrapVariable QMAKE_LFLAGS - - if [ $QT_EDITION = "QT_EDITION_OPENSOURCE" ]; then - EXTRA_CFLAGS="$EXTRA_CFLAGS -DQMAKE_OPENSOURCE_EDITION" - EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -DQMAKE_OPENSOURCE_EDITION" - fi - if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then - setBootstrapVariable QMAKE_CFLAGS_RELEASE - setBootstrapVariable QMAKE_CXXFLAGS_RELEASE 's,\$\$QMAKE_CFLAGS_RELEASE,\$(QMAKE_CFLAGS_RELEASE),' - EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_RELEASE)" - EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_RELEASE)" - elif [ "$CFG_DEBUG" = "yes" ]; then - setBootstrapVariable QMAKE_CFLAGS_DEBUG - setBootstrapVariable QMAKE_CXXFLAGS_DEBUG 's,\$\$QMAKE_CFLAGS_DEBUG,\$(QMAKE_CFLAGS_DEBUG),' - EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)" - EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)" - fi - - if [ '!' -z "$RPATH_FLAGS" ] && [ '!' -z "`getQMakeConf \"$QMAKESPEC\" | grep QMAKE_RPATH | awk '{print $3;}'`" ]; then - setBootstrapVariable QMAKE_RPATH 's,\$\$LITERAL_WHITESPACE, ,' - for rpath in $RPATH_FLAGS; do - EXTRA_LFLAGS="\$(QMAKE_RPATH)\"$rpath\" $EXTRA_LFLAGS" - done - fi - if [ "$PLATFORM_MAC" = "yes" ]; then - if [ "$PLATFORM" = "macx-icc" ]; then - echo "export MACOSX_DEPLOYMENT_TARGET = 10.4" >>"$mkfile" - else - echo "export MACOSX_DEPLOYMENT_TARGET = 10.3" >>"$mkfile" - fi - echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile" - echo "CARBON_CFLAGS =-fconstant-cfstrings" >>"$mkfile" - EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)" - EXTRA_CFLAGS="$EXTRA_CFLAGS \$(CARBON_CFLAGS)" - 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 # 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 # 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" - fi - if [ '!' -z "$CFG_SDK" ]; then - echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile" - echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile" - EXTRA_CFLAGS="$EXTRA_CFLAGS \$(SDK_CFLAGS)" - EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(SDK_CFLAGS)" - EXTRA_LFLAGS="$EXTRA_LFLAGS \$(SDK_LFLAGS)" - fi - fi - [ "$CFG_EMBEDDED" != "no" ] && EXTRA_CFLAGS="$EXTRA_CFLAGS -DQWS" - if [ '!' -z "$D_FLAGS" ]; then - for DEF in $D_FLAGS; do - EXTRA_CFLAGS="$EXTRA_CFLAGS \"-D${DEF}\"" - done - fi - QMAKE_BIN_DIR="$QT_INSTALL_BINS" - [ -z "$QMAKE_BIN_DIR" ] && QMAKE_BIN_DIR="${QT_INSTALL_PREFIX}/bin" - QMAKE_DATA_DIR="$QT_INSTALL_DATA" - [ -z "$QMAKE_DATA_DIR" ] && QMAKE_DATA_DIR="${QT_INSTALL_PREFIX}" - echo >>"$mkfile" - adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'` - adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'` - sed -e "s,@SOURCE_PATH@,$adjrelpath,g" -e "s,@BUILD_PATH@,$adjoutpath,g" \ - -e "s,@QMAKE_CFLAGS@,$EXTRA_CFLAGS,g" -e "s,@QMAKE_LFLAGS@,$EXTRA_LFLAGS,g" \ - -e "s,@QMAKE_CXXFLAGS@,$EXTRA_CXXFLAGS,g" \ - -e "s,@QT_INSTALL_BINS@,\$(INSTALL_ROOT)$QMAKE_BIN_DIR,g" \ - -e "s,@QT_INSTALL_DATA@,\$(INSTALL_ROOT)$QMAKE_DATA_DIR,g" \ - -e "s,@QMAKE_QTOBJS@,$EXTRA_OBJS,g" -e "s,@QMAKE_QTSRCS@,$EXTRA_SRCS,g" \ - -e "s,@QMAKESPEC@,$QMAKESPEC,g" "$in_mkfile" >>"$mkfile" - - if "$WHICH" makedepend >/dev/null 2>&1 && grep 'depend:' "$mkfile" >/dev/null 2>&1; then - (cd "$outpath/qmake" && "$MAKE" -f "$mkfile" depend) >/dev/null 2>&1 - sed "s,^.*/\([^/]*.o\):,\1:,g" "$mkfile" >"${mkfile}.tmp" - mv "${mkfile}.tmp" "${mkfile}" - fi - done - - QMAKE_BUILD_ERROR=no - (cd "$outpath/qmake"; "$MAKE") || QMAKE_BUILD_ERROR=yes - [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake - [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h - [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2 -fi # Build qmake - -#------------------------------------------------------------------------------- -# tests that need qmake -#------------------------------------------------------------------------------- - -# detect availability of float math.h functions -if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/floatmath "floatmath" $L_FLAGS $I_FLAGS $l_FLAGS; then - CFG_USE_FLOATMATH=yes -else - CFG_USE_FLOATMATH=no -fi - -# detect mmx support -if [ "${CFG_MMX}" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mmx "mmx" $L_FLAGS $I_FLAGS $l_FLAGS "-mmmx"; then - CFG_MMX=yes - else - CFG_MMX=no - fi -fi - -# detect 3dnow support -if [ "${CFG_3DNOW}" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/3dnow "3dnow" $L_FLAGS $I_FLAGS $l_FLAGS "-m3dnow"; then - CFG_3DNOW=yes - else - CFG_3DNOW=no - fi -fi - -# detect sse support -if [ "${CFG_SSE}" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse "sse" $L_FLAGS $I_FLAGS $l_FLAGS "-msse"; then - CFG_SSE=yes - else - CFG_SSE=no - fi -fi - -# detect sse2 support -if [ "${CFG_SSE2}" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse2 "sse2" $L_FLAGS $I_FLAGS $l_FLAGS "-msse2"; then - CFG_SSE2=yes - else - CFG_SSE2=no - fi -fi - -# check iWMMXt support -if [ "$CFG_IWMMXT" = "yes" ]; then - if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/iwmmxt "iwmmxt" $L_FLAGS $I_FLAGS $l_FLAGS "-mcpu=iwmmxt"; then - echo "The iWMMXt functionality test failed!" - echo " Please make sure your compiler supports iWMMXt intrinsics!" - exit 1 - fi -fi - -# detect zlib -if [ "$CFG_ZLIB" = "no" ]; then - # Note: Qt no longer support builds without zlib - # So we force a "no" to be "auto" here. - # If you REALLY really need no zlib support, you can still disable - # it by doing the following: - # add "no-zlib" to mkspecs/qconfig.pri - # #define QT_NO_COMPRESS (probably by adding to src/corelib/global/qconfig.h) - # - # There's no guarantee that Qt will build under those conditions - - CFG_ZLIB=auto - 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 $MAC_ARCHS_COMMANDLINE; then - CFG_ZLIB=system - else - CFG_ZLIB=yes - fi -fi - -# detect how jpeg should be built -if [ "$CFG_JPEG" = "auto" ]; then - if [ "$CFG_SHARED" = "yes" ]; then - CFG_JPEG=plugin - else - CFG_JPEG=yes - fi -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 $MAC_ARCHS_COMMANDLINE; then - CFG_LIBJPEG=system - else - CFG_LIBJPEG=qt - fi -fi - -# detect how gif should be built -if [ "$CFG_GIF" = "auto" ]; then - if [ "$CFG_SHARED" = "yes" ]; then - CFG_GIF=plugin - else - CFG_GIF=yes - fi -fi - -# detect how tiff should be built -if [ "$CFG_TIFF" = "auto" ]; then - if [ "$CFG_SHARED" = "yes" ]; then - CFG_TIFF=plugin - else - CFG_TIFF=yes - fi -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 $MAC_ARCHS_COMMANDLINE; then - CFG_LIBTIFF=system - else - CFG_LIBTIFF=qt - fi -fi - -# detect how mng should be built -if [ "$CFG_MNG" = "auto" ]; then - if [ "$CFG_SHARED" = "yes" ]; then - CFG_MNG=plugin - else - CFG_MNG=yes - fi -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 $MAC_ARCHS_COMMANDLINE; then - CFG_LIBMNG=system - else - CFG_LIBMNG=qt - fi -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 $MAC_ARCHS_COMMANDLINE; then - CFG_LIBPNG=system - else - CFG_LIBPNG=qt - fi -fi - -# detect accessibility -if [ "$CFG_ACCESSIBILITY" = "auto" ]; then - CFG_ACCESSIBILITY=yes -fi - -# auto-detect SQL-modules support -for _SQLDR in $CFG_SQL_AVAILABLE; do - case $_SQLDR in - mysql) - if [ "$CFG_SQL_mysql" != "no" ]; then - [ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`$WHICH mysql_config` - if [ -x "$CFG_MYSQL_CONFIG" ]; then - QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null` - QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null` - QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null` - QT_MYSQL_VERSION=`$CFG_MYSQL_CONFIG --version 2>/dev/null` - QT_MYSQL_VERSION_MAJOR=`echo $QT_MYSQL_VERSION | cut -d . -f 1` - fi - if [ -n "$QT_MYSQL_VERSION" ] && [ "$QT_MYSQL_VERSION_MAJOR" -lt 4 ]; then - if [ "$CFG_SQL_mysql" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "This version of MySql is not supported ($QT_MYSQL_VERSION)." - echo " You need MySql 4 or higher." - 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_SQL_mysql="no" - QT_LFLAGS_MYSQL="" - QT_LFLAGS_MYSQL_R="" - 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 $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 $MAC_ARCHS_COMMANDLINE; then - if [ "$CFG_SQL_mysql" = "auto" ]; then - CFG_SQL_mysql=plugin - fi - else - if [ "$CFG_SQL_mysql" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "MySQL 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_SQL_mysql=no - QT_LFLAGS_MYSQL="" - QT_LFLAGS_MYSQL_R="" - QT_CFLAGS_MYSQL="" - fi - fi - fi - fi - ;; - psql) - if [ "$CFG_SQL_psql" != "no" ]; then - 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` - fi - [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" - [ -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 - else - if [ "$CFG_SQL_psql" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "PostgreSQL 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_SQL_psql=no - QT_CFLAGS_PSQL="" - QT_LFLAGS_PSQL="" - fi - fi - fi - ;; - 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 $MAC_ARCHS_COMMANDLINE; then - if [ "$CFG_SQL_odbc" = "auto" ]; then - CFG_SQL_odbc=plugin - fi - else - if [ "$CFG_SQL_odbc" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "ODBC 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_SQL_odbc=no - fi - fi - fi - ;; - 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 $MAC_ARCHS_COMMANDLINE; then - if [ "$CFG_SQL_oci" = "auto" ]; then - CFG_SQL_oci=plugin - fi - else - if [ "$CFG_SQL_oci" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "Oracle (OCI) 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_SQL_oci=no - fi - fi - fi - ;; - 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 $MAC_ARCHS_COMMANDLINE; then - if [ "$CFG_SQL_tds" = "auto" ]; then - CFG_SQL_tds=plugin - fi - else - if [ "$CFG_SQL_tds" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "TDS 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_SQL_tds=no - fi - fi - fi - ;; - 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 $MAC_ARCHS_COMMANDLINE; then - if [ "$CFG_SQL_db2" = "auto" ]; then - CFG_SQL_db2=plugin - fi - else - if [ "$CFG_SQL_db2" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "ODBC 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_SQL_db2=no - fi - fi - fi - ;; - 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 $MAC_ARCHS_COMMANDLINE; then - if [ "$CFG_SQL_ibase" = "auto" ]; then - CFG_SQL_ibase=plugin - fi - else - if [ "$CFG_SQL_ibase" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "InterBase 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_SQL_ibase=no - fi - fi - fi - ;; - 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 $MAC_ARCHS_COMMANDLINE; then - if [ "$CFG_SQL_sqlite2" = "auto" ]; then - CFG_SQL_sqlite2=plugin - fi - else - if [ "$CFG_SQL_sqlite2" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "SQLite2 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_SQL_sqlite2=no - fi - fi - fi - ;; - sqlite) - if [ "$CFG_SQL_sqlite" != "no" ]; then - SQLITE_AUTODETECT_FAILED="no" - if [ "$CFG_SQLITE" = "system" ]; then - if [ -n "$PKG_CONFIG" ]; then - 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 $MAC_ARCHS_COMMANDLINE; then - if [ "$CFG_SQL_sqlite" = "auto" ]; then - CFG_SQL_sqlite=plugin - fi - QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite" - else - SQLITE_AUTODETECT_FAILED="yes" - CFG_SQL_sqlite=no - fi - elif [ -f "$relpath/src/3rdparty/sqlite/sqlite3.h" ]; then - if [ "$CFG_SQL_sqlite" = "auto" ]; then - CFG_SQL_sqlite=plugin - fi - else - SQLITE_AUTODETECT_FAILED="yes" - CFG_SQL_sqlite=no - fi - - if [ "$SQLITE_AUTODETECT_FAILED" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "SQLite 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 - fi - fi - ;; - *) - if [ "$OPT_VERBOSE" = "yes" ]; then - echo "unknown SQL driver: $_SQLDR" - fi - ;; - esac -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 $MAC_ARCHS_COMMANDLINE; then - CFG_NIS=yes - else - if [ "$CFG_NIS" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "NIS 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_NIS=no - fi - fi -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 $MAC_ARCHS_COMMANDLINE; then - CFG_CUPS=yes - else - if [ "$CFG_CUPS" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "Cups 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_CUPS=no - fi - fi -fi - -# auto-detect iconv(3) support -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 $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 $MAC_ARCHS_COMMANDLINE; then - CFG_ICONV=gnu - else - if [ "$CFG_ICONV" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "Iconv 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_ICONV=no - fi - fi -fi - -# auto-detect libdbus-1 support -if [ "$CFG_DBUS" != "no" ]; then - if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --atleast-version="$MIN_DBUS_1_VERSION" dbus-1 2>/dev/null; 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 $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" - else - if [ "$CFG_DBUS" = "auto" ]; then - CFG_DBUS=no - elif [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - # CFG_DBUS is "yes" or "linked" here - - echo "The QtDBus module cannot be enabled because libdbus-1 version $MIN_DBUS_1_VERSION was not found." - 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 - fi - 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" - X11TESTS_FLAGS= - - # work around broken X11 headers when using GCC 2.95 or later - NOTYPE=no - "$x11tests/notype.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" && NOTYPE=yes - if [ $NOTYPE = "yes" ]; then - QMakeVar add QMAKE_CXXFLAGS -fpermissive - X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive" - fi - - # 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=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 - if [ "$CFG_XCURSOR" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xcursor "Xcursor" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then - if [ "$CFG_XCURSOR" != "runtime" ]; then - CFG_XCURSOR=yes; - fi - else - if [ "$CFG_XCURSOR" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "Xcursor 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_XCURSOR=no - fi - fi - fi - - # auto-detect Xfixes support - if [ "$CFG_XFIXES" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xfixes "Xfixes" $L_FLAGS $I_FLAGS $X11TESTS_FLAGS; then - if [ "$CFG_XFIXES" != "runtime" ]; then - CFG_XFIXES=yes; - fi - else - if [ "$CFG_XFIXES" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "Xfixes 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_XFIXES=no - fi - fi - fi - - # 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!" - 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_XRANDR=no - fi - fi - fi - - # auto-detect Xrender support - if [ "$CFG_XRENDER" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xrender "Xrender" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then - CFG_XRENDER=yes - else - if [ "$CFG_XRENDER" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "Xrender 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_XRENDER=no - fi - 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 [ -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_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 - echo "FontConfig 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_FONTCONFIG=no - fi - fi - fi - - # auto-detect Session Management support - if [ "$CFG_SM" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/sm "Session Management" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then - CFG_SM=yes - else - if [ "$CFG_SM" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "Session Management 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_SM=no - fi - fi - fi - - # auto-detect SHAPE support - if [ "$CFG_XSHAPE" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xshape "XShape" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then - CFG_XSHAPE=yes - else - if [ "$CFG_XSHAPE" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "XShape 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_XSHAPE=no - fi - fi - fi - - # auto-detect XSync support - if [ "$CFG_XSYNC" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xsync "XSync" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then - CFG_XSYNC=yes - else - if [ "$CFG_XSYNC" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "XSync 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_XSYNC=no - fi - fi - fi - - # auto-detect Xinerama support - if [ "$CFG_XINERAMA" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xinerama "Xinerama" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then - if [ "$CFG_XINERAMA" != "runtime" ]; then - CFG_XINERAMA=yes - fi - else - if [ "$CFG_XINERAMA" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "Xinerama 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_XINERAMA=no - fi - fi - fi - - # 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_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_XINPUT=no - fi - fi - fi - - # auto-detect XKB support - if [ "$CFG_XKB" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xkb "XKB" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then - CFG_XKB=yes - else - if [ "$CFG_XKB" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "XKB 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_XKB=no - fi - fi - fi - - if [ "$CFG_GLIB" = "yes" -a "$CFG_QGTKSTYLE" != "no" ]; then - if [ -n "$PKG_CONFIG" ]; then - 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 [ -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_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_QGTKSTYLE=no - fi - fi - elif [ "$CFG_GLIB" = "no" ]; then - CFG_QGTKSTYLE=no - fi -fi # X11 - - -if [ "$PLATFORM_MAC" = "yes" ]; then - if [ "$CFG_PHONON" != "no" ]; then - # Always enable Phonon (unless it was explicitly disabled) - CFG_PHONON=yes - fi -fi - -# QWS -if [ "$PLATFORM_QWS" = "yes" ]; then - - # 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/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 - for screen in ${CFG_GFX_ON} ${CFG_GFX_PLUGIN}; do - if [ "${screen}" = "ahi" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; then - if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/ahi "Ahi" $L_FLAGS $I_FLAGS $l_FLAGS; then - echo "The Ahi 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 " ${XQMAKESPEC}." - exit 1 - fi - fi - - if [ "${screen}" = "svgalib" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; then - if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/svgalib "SVGAlib" $L_FLAGS $I_FLAGS $l_FLAGS; then - echo "The SVGAlib 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 " ${XQMAKESPEC}." - exit 1 - fi - fi - - if [ "${screen}" = "directfb" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; 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 " QT_CFLAGS_DIRECTFB and QT_LIBS_DIRECTFB in" - echo " ${XQMAKESPEC}." - exit 1 - fi - fi - - done - - # mouse drivers - for mouse in ${CFG_MOUSE_ON} ${CFG_MOUSE_PLUGIN}; do - if [ "${mouse}" = "tslib" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; then - if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tslib "tslib" $L_FLAGS $I_FLAGS $l_FLAGS; then - echo "The tslib 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 " ${XQMAKESPEC}." - exit 1 - fi - 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" - fi - -fi # QWS - -# freetype support -[ "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 $MAC_ARCHS_COMMANDLINE; then - CFG_LIBFREETYPE=system - else - CFG_LIBFREETYPE=yes - fi -fi - -if [ "$CFG_ENDIAN" = "auto" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then - true #leave as auto - else - "$unixtests/endian.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" - F="$?" - if [ "$F" -eq 0 ]; then - CFG_ENDIAN="Q_LITTLE_ENDIAN" - elif [ "$F" -eq 1 ]; then - CFG_ENDIAN="Q_BIG_ENDIAN" - else - echo - echo "The target system byte order could not be detected!" - echo "Turn on verbose messaging (-v) to see the final report." - echo "You can use the -little-endian or -big-endian switch to" - echo "$0 to continue." - exit 101 - fi - fi -fi - -if [ "$CFG_HOST_ENDIAN" = "auto" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then - true #leave as auto - else - "$unixtests/endian.test" "$QMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" - F="$?" - if [ "$F" -eq 0 ]; then - CFG_HOST_ENDIAN="Q_LITTLE_ENDIAN" - elif [ "$F" -eq 1 ]; then - CFG_HOST_ENDIAN="Q_BIG_ENDIAN" - else - echo - echo "The host system byte order could not be detected!" - echo "Turn on verbose messaging (-v) to see the final report." - echo "You can use the -host-little-endian or -host-big-endian switch to" - echo "$0 to continue." - exit 101 - fi - fi -fi - -if [ "$CFG_ARMFPA" != "auto" ]; then - if [ "$CFG_ARMFPA" = "yes" ]; then - if [ "$CFG_ENDIAN" = "Q_LITTLE_ENDIAN" ]; then - CFG_DOUBLEFORMAT="Q_DOUBLE_LITTLE_SWAPPED" - else - CFG_DOUBLEFORMAT="Q_DOUBLE_BIG_SWAPPED" - fi - else - CFG_DOUBLEFORMAT="normal" - fi -fi - - -if [ "$CFG_DOUBLEFORMAT" = "auto" ]; then - if [ "$PLATFORM_QWS" != "yes" ]; then - CFG_DOUBLEFORMAT=normal - else - "$unixtests/doubleformat.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" - F="$?" - if [ "$F" -eq 10 ] && [ "$CFG_ENDIAN" = "Q_LITTLE_ENDIAN" ]; then - CFG_DOUBLEFORMAT=normal - elif [ "$F" -eq 11 ] && [ "$CFG_ENDIAN" = "Q_BIG_ENDIAN" ]; then - CFG_DOUBLEFORMAT=normal - elif [ "$F" -eq 10 ]; then - CFG_DOUBLEFORMAT="Q_DOUBLE_LITTLE" - elif [ "$F" -eq 11 ]; then - CFG_DOUBLEFORMAT="Q_DOUBLE_BIG" - elif [ "$F" -eq 12 ]; then - CFG_DOUBLEFORMAT="Q_DOUBLE_LITTLE_SWAPPED" - CFG_ARMFPA="yes" - elif [ "$F" -eq 13 ]; then - CFG_DOUBLEFORMAT="Q_DOUBLE_BIG_SWAPPED" - CFG_ARMFPA="yes" - else - echo - echo "The system floating point format could not be detected." - echo "This may cause data to be generated in a wrong format" - echo "Turn on verbose messaging (-v) to see the final report." - # we do not fail on this since this is a new test, and if it fails, - # the old behavior should be correct in most cases - CFG_DOUBLEFORMAT=normal - fi - fi -fi - -HAVE_STL=no -if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then - HAVE_STL=yes -fi - -if [ "$CFG_STL" != "no" ]; then - if [ "$HAVE_STL" = "yes" ]; then - CFG_STL=yes - else - if [ "$CFG_STL" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "STL 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_STL=no - fi - fi -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 $MAC_ARCHS_COMMANDLINE; then - CFG_IPV6=yes - else - if [ "$CFG_IPV6" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "IPv6 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_IPV6=no - fi - fi -fi - -# detect POSIX clock_gettime() -if [ "$CFG_CLOCK_GETTIME" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/clock-gettime "POSIX clock_gettime()" $L_FLAGS $I_FLAGS $l_FLAGS; then - CFG_CLOCK_GETTIME=yes - else - CFG_CLOCK_GETTIME=no - fi -fi - -# detect POSIX monotonic clocks -if [ "$CFG_CLOCK_GETTIME" = "yes" ] && [ "$CFG_CLOCK_MONOTONIC" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/clock-monotonic "POSIX Monotonic Clock" $L_FLAGS $I_FLAGS $l_FLAGS; then - CFG_CLOCK_MONOTONIC=yes - else - CFG_CLOCK_MONOTONIC=no - fi -elif [ "$CFG_CLOCK_GETTIME" = "no" ]; then - CFG_CLOCK_MONOTONIC=no -fi - -# detect mremap -if [ "$CFG_MREMAP" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mremap "mremap" $L_FLAGS $I_FLAGS $l_FLAGS; then - CFG_MREMAP=yes - else - CFG_MREMAP=no - fi -fi - -# find if the platform provides getaddrinfo (ipv6 dns lookups) -if [ "$CFG_GETADDRINFO" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/getaddrinfo "getaddrinfo" $L_FLAGS $I_FLAGS $l_FLAGS; then - CFG_GETADDRINFO=yes - else - if [ "$CFG_GETADDRINFO" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "getaddrinfo 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_GETADDRINFO=no - fi - fi -fi - -# find if the platform provides inotify -if [ "$CFG_INOTIFY" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/inotify "inotify" $L_FLAGS $I_FLAGS $l_FLAGS; then - CFG_INOTIFY=yes - else - if [ "$CFG_INOTIFY" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "inotify 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_INOTIFY=no - fi - fi -fi - -# find if the platform provides if_nametoindex (ipv6 interface name support) -if [ "$CFG_IPV6IFNAME" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6ifname "IPv6 interface name" $L_FLAGS $I_FLAGS $l_FLAGS; then - CFG_IPV6IFNAME=yes - else - if [ "$CFG_IPV6IFNAME" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "IPv6 interface name 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_IPV6IFNAME=no - fi - fi -fi - -# find if the platform provides getifaddrs (network interface enumeration) -if [ "$CFG_GETIFADDRS" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/getifaddrs "getifaddrs" $L_FLAGS $I_FLAGS $l_FLAGS; then - CFG_GETIFADDRS=yes - else - if [ "$CFG_GETIFADDRS" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "getifaddrs 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_GETIFADDRS=no - fi - fi -fi - -# find if the platform supports X/Open Large File compilation environment -if [ "$CFG_LARGEFILE" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/largefile "X/Open Large File" $L_FLAGS $I_FLAGS $l_FLAGS; then - CFG_LARGEFILE=yes - else - if [ "$CFG_LARGEFILE" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "X/Open Large File 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_LARGEFILE=no - fi - fi -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 $MAC_ARCHS_COMMANDLINE; then - if [ "$CFG_OPENSSL" = "auto" ]; then - CFG_OPENSSL=yes - fi - else - if ( [ "$CFG_OPENSSL" = "yes" ] || [ "$CFG_OPENSSL" = "linked" ] ) && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "OpenSSL 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_OPENSSL=no - fi - 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 -#------------------------------------------------------------------------------- - -### fix this: user input should be validated in a loop -if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PLATFORM_QWS" = "yes" ]; then - echo - echo "Choose pixel-depths to support:" - echo - echo " 1. 1bpp, black/white" - echo " 4. 4bpp, grayscale" - echo " 8. 8bpp, paletted" - echo " 12. 12bpp, rgb 4-4-4" - echo " 15. 15bpp, rgb 5-5-5" - echo " 16. 16bpp, rgb 5-6-5" - echo " 18. 18bpp, rgb 6-6-6" - echo " 24. 24bpp, rgb 8-8-8" - echo " 32. 32bpp, argb 8-8-8-8 and rgb 8-8-8" - echo " all. All supported depths" - echo - echo "Your choices (default 8,16,32):" - read CFG_QWS_DEPTHS - if [ -z "$CFG_QWS_DEPTHS" ] || [ "$CFG_QWS_DEPTHS" = "yes" ]; then - CFG_QWS_DEPTHS=8,16,32 - fi -fi -if [ -n "$CFG_QWS_DEPTHS" -a "$PLATFORM_QWS" = "yes" ]; then - if [ "$CFG_QWS_DEPTHS" = "all" ]; then - CFG_QWS_DEPTHS="1 4 8 12 15 16 18 24 32 generic" - fi - for D in `echo "$CFG_QWS_DEPTHS" | sed -e 's/,/ /g'`; do - case $D in - 1|4|8|12|15|16|18|24|32) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_$D";; - generic) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_GENERIC";; - esac - done -fi - -# enable dwarf2 support on Mac -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" -fi - -# enable Phonon -if [ "$CFG_PHONON" = "yes" ]; then - QT_CONFIG="$QT_CONFIG phonon" - if [ "$CFG_PHONON_BACKEND" = "yes" ]; then - QT_CONFIG="$QT_CONFIG phonon-backend" - fi -else -# QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_PHONON" -fi - -# disable accessibility -if [ "$CFG_ACCESSIBILITY" = "no" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ACCESSIBILITY" -else - QT_CONFIG="$QT_CONFIG accessibility" -fi - -# enable opengl -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" - fi - 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 -if [ "$CFG_SXE" != "no" ]; then - QT_CONFIG="$QT_CONFIG sxe" -fi - -# build up the variables for output -if [ "$CFG_DEBUG" = "yes" ]; then - QMAKE_OUTDIR="${QMAKE_OUTDIR}debug" - QMAKE_CONFIG="$QMAKE_CONFIG debug" -elif [ "$CFG_DEBUG" = "no" ]; then - QMAKE_OUTDIR="${QMAKE_OUTDIR}release" - QMAKE_CONFIG="$QMAKE_CONFIG release" -fi -if [ "$CFG_SHARED" = "yes" ]; then - QMAKE_OUTDIR="${QMAKE_OUTDIR}-shared" - QMAKE_CONFIG="$QMAKE_CONFIG shared dll" -elif [ "$CFG_SHARED" = "no" ]; then - QMAKE_OUTDIR="${QMAKE_OUTDIR}-static" - QMAKE_CONFIG="$QMAKE_CONFIG static" -fi -if [ "$PLATFORM_QWS" = "yes" ]; then - QMAKE_OUTDIR="${QMAKE_OUTDIR}-emb-$CFG_EMBEDDED" - QMAKE_CONFIG="$QMAKE_CONFIG embedded" - QT_CONFIG="$QT_CONFIG embedded" - rm -f "src/.moc/$QMAKE_OUTDIR/allmoc.cpp" # needs remaking if config changes -fi -QMakeVar set PRECOMPILED_DIR ".pch/$QMAKE_OUTDIR" -QMakeVar set OBJECTS_DIR ".obj/$QMAKE_OUTDIR" -QMakeVar set MOC_DIR ".moc/$QMAKE_OUTDIR" -QMakeVar set RCC_DIR ".rcc/$QMAKE_OUTDIR" -QMakeVar set UI_DIR ".uic/$QMAKE_OUTDIR" -if [ "$CFG_LARGEFILE" = "yes" ]; then - QMAKE_CONFIG="$QMAKE_CONFIG largefile" -fi -if [ "$CFG_STL" = "no" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STL" -else - QMAKE_CONFIG="$QMAKE_CONFIG stl" -fi -if [ "$CFG_USE_GNUMAKE" = "yes" ]; then - QMAKE_CONFIG="$QMAKE_CONFIG GNUmake" -fi -[ "$CFG_REDUCE_EXPORTS" = "yes" ] && QT_CONFIG="$QT_CONFIG reduce_exports" -[ "$CFG_REDUCE_RELOCATIONS" = "yes" ] && QT_CONFIG="$QT_CONFIG reduce_relocations" -[ "$CFG_PRECOMPILE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG precompile_header" -if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then - QMakeVar add QMAKE_CFLAGS -g - QMakeVar add QMAKE_CXXFLAGS -g - QMAKE_CONFIG="$QMAKE_CONFIG separate_debug_info" -fi -[ "$CFG_MMX" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG mmx" -[ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow" -[ "$CFG_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse" -[ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2" -[ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt" -[ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS" -if [ "$CFG_IPV6" = "yes" ]; then - QT_CONFIG="$QT_CONFIG ipv6" -fi -if [ "$CFG_CLOCK_GETTIME" = "yes" ]; then - QT_CONFIG="$QT_CONFIG clock-gettime" -fi -if [ "$CFG_CLOCK_MONOTONIC" = "yes" ]; then - QT_CONFIG="$QT_CONFIG clock-monotonic" -fi -if [ "$CFG_MREMAP" = "yes" ]; then - QT_CONFIG="$QT_CONFIG mremap" -fi -if [ "$CFG_GETADDRINFO" = "yes" ]; then - QT_CONFIG="$QT_CONFIG getaddrinfo" -fi -if [ "$CFG_IPV6IFNAME" = "yes" ]; then - QT_CONFIG="$QT_CONFIG ipv6ifname" -fi -if [ "$CFG_GETIFADDRS" = "yes" ]; then - QT_CONFIG="$QT_CONFIG getifaddrs" -fi -if [ "$CFG_INOTIFY" = "yes" ]; then - QT_CONFIG="$QT_CONFIG inotify" -fi -if [ "$CFG_LIBJPEG" = "no" ]; then - CFG_JPEG="no" -elif [ "$CFG_LIBJPEG" = "system" ]; then - QT_CONFIG="$QT_CONFIG system-jpeg" -fi -if [ "$CFG_JPEG" = "no" ]; then - QT_CONFIG="$QT_CONFIG no-jpeg" -elif [ "$CFG_JPEG" = "yes" ]; then - QT_CONFIG="$QT_CONFIG jpeg" -fi -if [ "$CFG_LIBMNG" = "no" ]; then - CFG_MNG="no" -elif [ "$CFG_LIBMNG" = "system" ]; then - QT_CONFIG="$QT_CONFIG system-mng" -fi -if [ "$CFG_MNG" = "no" ]; then - QT_CONFIG="$QT_CONFIG no-mng" -elif [ "$CFG_MNG" = "yes" ]; then - QT_CONFIG="$QT_CONFIG mng" -fi -if [ "$CFG_LIBPNG" = "no" ]; then - CFG_PNG="no" -fi -if [ "$CFG_LIBPNG" = "system" ]; then - QT_CONFIG="$QT_CONFIG system-png" -fi -if [ "$CFG_PNG" = "no" ]; then - QT_CONFIG="$QT_CONFIG no-png" -elif [ "$CFG_PNG" = "yes" ]; then - QT_CONFIG="$QT_CONFIG png" -fi -if [ "$CFG_GIF" = "no" ]; then - QT_CONFIG="$QT_CONFIG no-gif" -elif [ "$CFG_GIF" = "yes" ]; then - QT_CONFIG="$QT_CONFIG gif" -fi -if [ "$CFG_LIBTIFF" = "no" ]; then - CFG_TIFF="no" -elif [ "$CFG_LIBTIFF" = "system" ]; then - QT_CONFIG="$QT_CONFIG system-tiff" -fi -if [ "$CFG_TIFF" = "no" ]; then - QT_CONFIG="$QT_CONFIG no-tiff" -elif [ "$CFG_TIFF" = "yes" ]; then - QT_CONFIG="$QT_CONFIG tiff" -fi -if [ "$CFG_LIBFREETYPE" = "no" ]; then - QT_CONFIG="$QT_CONFIG no-freetype" -elif [ "$CFG_LIBFREETYPE" = "system" ]; then - QT_CONFIG="$QT_CONFIG system-freetype" -else - QT_CONFIG="$QT_CONFIG freetype" -fi - -if [ "x$PLATFORM_MAC" = "xyes" ]; then - #On Mac we implicitly link against libz, so we - #never use the 3rdparty stuff. - [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system" -fi -if [ "$CFG_ZLIB" = "yes" ]; then - QT_CONFIG="$QT_CONFIG zlib" -elif [ "$CFG_ZLIB" = "system" ]; then - QT_CONFIG="$QT_CONFIG system-zlib" -fi - -[ "$CFG_NIS" = "yes" ] && QT_CONFIG="$QT_CONFIG nis" -[ "$CFG_CUPS" = "yes" ] && QT_CONFIG="$QT_CONFIG cups" -[ "$CFG_ICONV" = "yes" ] && QT_CONFIG="$QT_CONFIG iconv" -[ "$CFG_ICONV" = "gnu" ] && QT_CONFIG="$QT_CONFIG gnu-libiconv" -[ "$CFG_GLIB" = "yes" ] && QT_CONFIG="$QT_CONFIG glib" -[ "$CFG_GSTREAMER" = "yes" ] && QT_CONFIG="$QT_CONFIG gstreamer" -[ "$CFG_DBUS" = "yes" ] && QT_CONFIG="$QT_CONFIG dbus" -[ "$CFG_DBUS" = "linked" ] && QT_CONFIG="$QT_CONFIG dbus dbus-linked" -[ "$CFG_NAS" = "system" ] && QT_CONFIG="$QT_CONFIG nas" -[ "$CFG_OPENSSL" = "yes" ] && QT_CONFIG="$QT_CONFIG openssl" -[ "$CFG_OPENSSL" = "linked" ] && QT_CONFIG="$QT_CONFIG openssl-linked" - -if [ "$PLATFORM_X11" = "yes" ]; then - [ "$CFG_SM" = "yes" ] && QT_CONFIG="$QT_CONFIG x11sm" - - # for some reason, the following libraries are not always built shared, - # so *every* program/lib (including Qt) has to link against them - if [ "$CFG_XSHAPE" = "yes" ]; then - QT_CONFIG="$QT_CONFIG xshape" - fi - if [ "$CFG_XSYNC" = "yes" ]; then - QT_CONFIG="$QT_CONFIG xsync" - fi - if [ "$CFG_XINERAMA" = "yes" ]; then - QT_CONFIG="$QT_CONFIG xinerama" - QMakeVar set QMAKE_LIBS_X11 '-lXinerama $$QMAKE_LIBS_X11' - fi - if [ "$CFG_XCURSOR" = "yes" ]; then - QT_CONFIG="$QT_CONFIG xcursor" - QMakeVar set QMAKE_LIBS_X11 '-lXcursor $$QMAKE_LIBS_X11' - fi - if [ "$CFG_XFIXES" = "yes" ]; then - QT_CONFIG="$QT_CONFIG xfixes" - QMakeVar set QMAKE_LIBS_X11 '-lXfixes $$QMAKE_LIBS_X11' - fi - if [ "$CFG_XRANDR" = "yes" ]; then - QT_CONFIG="$QT_CONFIG xrandr" - if [ "$CFG_XRENDER" != "yes" ]; then - # libXrandr uses 1 function from libXrender, so we always have to have it :/ - QMakeVar set QMAKE_LIBS_X11 '-lXrandr -lXrender $$QMAKE_LIBS_X11' - else - QMakeVar set QMAKE_LIBS_X11 '-lXrandr $$QMAKE_LIBS_X11' - fi - fi - if [ "$CFG_XRENDER" = "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_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 -fi - -[ '!' -z "$D_FLAGS" ] && QMakeVar add DEFINES "$D_FLAGS" -[ '!' -z "$L_FLAGS" ] && QMakeVar add QMAKE_LIBDIR_FLAGS "$L_FLAGS" -[ '!' -z "$l_FLAGS" ] && QMakeVar add LIBS "$l_FLAGS" - -if [ "$PLATFORM_MAC" = "yes" ]; then - if [ "$CFG_RPATH" = "yes" ]; then - QMAKE_CONFIG="$QMAKE_CONFIG absolute_library_soname" - fi -elif [ -z "`getQMakeConf \"$XQMAKESPEC\" | grep QMAKE_RPATH | awk '{print $3;}'`" ]; then - if [ -n "$RPATH_FLAGS" ]; then - echo - echo "ERROR: -R cannot be used on this platform as \$QMAKE_RPATH is" - echo " undefined." - echo - exit 1 - elif [ "$CFG_RPATH" = "yes" ]; then - RPATH_MESSAGE=" NOTE: This platform does not support runtime library paths, using -no-rpath." - CFG_RPATH=no - fi -else - if [ "$CFG_RPATH" = "yes" ]; then - # set the default rpath to the library installation directory - RPATH_FLAGS="\"$QT_INSTALL_LIBS\" $RPATH_FLAGS" - fi - if [ -n "$RPATH_FLAGS" ]; then - # add the user defined rpaths - QMakeVar add QMAKE_RPATHDIR "$RPATH_FLAGS" - fi -fi - -if [ '!' -z "$I_FLAGS" ]; then - # add the user define include paths - QMakeVar add QMAKE_CFLAGS "$I_FLAGS" - QMakeVar add QMAKE_CXXFLAGS "$I_FLAGS" -fi - -# turn off exceptions for the compilers that support it -if [ "$PLATFORM_QWS" = "yes" ]; then - COMPILER=`echo $XPLATFORM | cut -f 3- -d-` -else - COMPILER=`echo $PLATFORM | cut -f 2- -d-` -fi -if [ "$CFG_EXCEPTIONS" = "unspecified" -a "$PLATFORM_QWS" = "yes" ]; then - CFG_EXCEPTIONS=no -fi - -if [ "$CFG_EXCEPTIONS" != "no" ]; then - QTCONFIG_CONFIG="$QTCONFIG_CONFIG exceptions" -fi - -# -# Some Qt modules are too advanced in C++ for some old compilers -# Detect here the platforms where they are known to work. -# -# See Qt documentation for more information on which features are -# supported and on which compilers. -# -canBuildQtXmlPatterns="yes" -canBuildWebKit="$HAVE_STL" - -# WebKit requires stdint.h -"$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 - 4*|3.4*) - ;; - 3.3*) - canBuildWebKit="no" - ;; - *) - canBuildWebKit="no" - canBuildQtXmlPatterns="no" - ;; - esac - ;; - solaris-cc*) - # Check the compiler version - case `${QMAKE_CONF_COMPILER} -V 2>&1 | awk '{print $4}'` in - *) - canBuildWebKit="no" - canBuildQtXmlPatterns="no" - ;; - esac - ;; - hpux-acc*) - canBuildWebKit="no" - canBuildQtXmlPatterns="no" - ;; - hpuxi-acc*) - canBuildWebKit="no" - ;; - aix-xlc*) - canBuildWebKit="no" - canBuildQtXmlPatterns="no" - ;; - irix-cc*) - canBuildWebKit="no" - ;; -esac - -if [ "$CFG_XMLPATTERNS" = "yes" -a "$CFG_EXCEPTIONS" = "no" ]; then - echo "QtXmlPatterns was requested, but it can't be built due to exceptions being disabled." - exit 1 -fi -if [ "$CFG_XMLPATTERNS" = "auto" -a "$CFG_EXCEPTIONS" != "no" ]; then - CFG_XMLPATTERNS="$canBuildQtXmlPatterns" -elif [ "$CFG_EXCEPTIONS" = "no" ]; then - CFG_XMLPATTERNS="no" -fi -if [ "$CFG_XMLPATTERNS" = "yes" ]; then - QT_CONFIG="$QT_CONFIG xmlpatterns" -else -# QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XMLPATTERNS" -fi - -if [ "$CFG_SVG" = "yes" ]; then - QT_CONFIG="$QT_CONFIG svg" -else - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SVG" -fi - -if [ "$CFG_WEBKIT" = "auto" ]; then - CFG_WEBKIT="$canBuildWebKit" -fi - -if [ "$CFG_WEBKIT" = "yes" ]; then - QT_CONFIG="$QT_CONFIG webkit" - # The reason we set CFG_WEBKIT, is such that the printed overview of what will be enabled, shows correctly. - CFG_WEBKIT="yes" -else - CFG_WEBKIT="no" - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_WEBKIT" -fi - -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 - case "$COMPILER" in - g++*) - QMakeVar add QMAKE_CFLAGS -fno-exceptions - QMakeVar add QMAKE_CXXFLAGS -fno-exceptions - QMakeVar add QMAKE_LFLAGS -fno-exceptions - ;; - cc*) - case "$PLATFORM" in - irix-cc*) - QMakeVar add QMAKE_CFLAGS -LANG:exceptions=off - QMakeVar add QMAKE_CXXFLAGS -LANG:exceptions=off - QMakeVar add QMAKE_LFLAGS -LANG:exceptions=off - ;; - *) ;; - esac - ;; - *) ;; - esac - 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 -#------------------------------------------------------------------------------- - -# some compilers generate binary incompatible code between different versions, -# so we need to generate a build key that is different between these compilers -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.*" - ;; - 3.*) - COMPILER_VERSION="3.*" - ;; - 4.*) - COMPILER_VERSION="4" - ;; - *) - ;; - esac - [ '!' -z "$COMPILER_VERSION" ] && COMPILER="g++-${COMPILER_VERSION}" - ;; -*) - # - ;; -esac - -# QT_CONFIG can contain the following: -# -# Things that affect the Qt API/ABI: -# -# Options: -# minimal-config small-config medium-config large-config full-config -# -# Different edition modules: -# network canvas table xml opengl sql -# -# Options: -# stl -# -# Things that do not affect the Qt API/ABI: -# system-jpeg no-jpeg jpeg -# system-mng no-mng mng -# system-png no-png png -# system-zlib no-zlib zlib -# system-libtiff no-libtiff -# no-gif gif -# debug release -# dll staticlib -# -# internal -# nocrosscompiler -# GNUmake -# largefile -# nis -# nas -# tablet -# ipv6 -# -# X11 : x11sm xinerama xcursor xfixes xrandr xrender mitshm fontconfig xkb -# Embedded: embedded freetype -# -ALL_OPTIONS="stl" -BUILD_CONFIG= -BUILD_OPTIONS= - -# determine the build options -for config_option in $QMAKE_CONFIG $QT_CONFIG; do - SKIP="yes" - case "$config_option" in - *-config) - # take the last *-config setting. this is the highest config being used, - # and is the one that we will use for tagging plugins - BUILD_CONFIG="$config_option" - ;; - - stl) - # these config options affect the Qt API/ABI. they should influence - # the generation of the buildkey, so we don't skip them - SKIP="no" - ;; - - *) # skip all other options since they don't affect the Qt API/ABI. - ;; - esac - - if [ "$SKIP" = "no" ]; then - BUILD_OPTIONS="$BUILD_OPTIONS $config_option" - fi -done - -# put the options that we are missing into .options -rm -f .options -for opt in `echo $ALL_OPTIONS`; do - SKIP="no" - if echo $BUILD_OPTIONS | grep $opt >/dev/null 2>&1; then - SKIP="yes" - fi - if [ "$SKIP" = "no" ]; then - echo "$opt" >> .options - fi -done - -# reconstruct BUILD_OPTIONS with a sorted negative feature list -# (ie. only things that are missing are will be put into the build key) -BUILD_OPTIONS= -if [ -f .options ]; then - for opt in `sort -f .options | uniq`; do - BUILD_OPTIONS="$BUILD_OPTIONS no-$opt" - done -fi -rm -f .options - -# QT_NO* defines affect the Qt API (and binary compatibility). they need -# to be included in the build key -for build_option in $D_FLAGS; do - build_option=`echo $build_option | cut -d \" -f 2 -` - case "$build_option" in - QT_NO*) - echo "$build_option" >> .options - ;; - *) - # skip all other compiler defines - ;; - esac -done - -# sort the compile time defines (helps ensure that changes in this configure -# script don't affect the QT_BUILD_KEY generation) -if [ -f .options ]; then - for opt in `sort -f .options | uniq`; do - BUILD_OPTIONS="$BUILD_OPTIONS $opt" - done -fi -rm -f .options - -BUILD_OPTIONS="$BUILD_CONFIG $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 -#------------------------------------------------------------------------------- - -case "$CFG_QCONFIG" in -full) - echo "/* Everything */" >"$outpath/src/corelib/global/qconfig.h.new" - ;; -*) - tmpconfig="$outpath/src/corelib/global/qconfig.h.new" - echo "#ifndef QT_BOOTSTRAPPED" >"$tmpconfig" - cat "$relpath/src/corelib/global/qconfig-$CFG_QCONFIG.h" >>"$tmpconfig" - echo "#endif" >>"$tmpconfig" - ;; -esac - -cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF - -/* Qt Edition */ -#ifndef QT_EDITION -# define QT_EDITION $QT_EDITION -#endif - -/* 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 - cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF -#if defined(__BIG_ENDIAN__) -# define Q_BYTE_ORDER Q_BIG_ENDIAN -#elif defined(__LITTLE_ENDIAN__) -# define Q_BYTE_ORDER Q_LITTLE_ENDIAN -#else -# error "Unable to determine byte order!" -#endif -EOF -else - echo "#define Q_BYTE_ORDER $CFG_HOST_ENDIAN" >>"$outpath/src/corelib/global/qconfig.h.new" -fi -echo "#else" >>"$outpath/src/corelib/global/qconfig.h.new" -if [ "$CFG_ENDIAN" = "auto" ]; then - cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF -#if defined(__BIG_ENDIAN__) -# define Q_BYTE_ORDER Q_BIG_ENDIAN -#elif defined(__LITTLE_ENDIAN__) -# define Q_BYTE_ORDER Q_LITTLE_ENDIAN -#else -# error "Unable to determine byte order!" -#endif -EOF -else - echo "#define Q_BYTE_ORDER $CFG_ENDIAN" >>"$outpath/src/corelib/global/qconfig.h.new" -fi -echo "#endif" >>"$outpath/src/corelib/global/qconfig.h.new" - -if [ "$CFG_DOUBLEFORMAT" != "normal" ]; then - cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF -/* Non-IEEE double format */ -#define Q_DOUBLE_LITTLE "01234567" -#define Q_DOUBLE_BIG "76543210" -#define Q_DOUBLE_LITTLE_SWAPPED "45670123" -#define Q_DOUBLE_BIG_SWAPPED "32107654" -#define Q_DOUBLE_FORMAT $CFG_DOUBLEFORMAT -EOF -fi -if [ "$CFG_ARMFPA" = "yes" ]; then - if [ "$CFG_ARCH" != "$CFG_HOST_ARCH" ]; then - cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF -#ifndef QT_BOOTSTRAPPED -# define QT_ARMFPA -#endif -EOF - else - echo "#define QT_ARMFPA" >>"$outpath/src/corelib/global/qconfig.h.new" - fi -fi - -CFG_ARCH_STR=`echo $CFG_ARCH | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -CFG_HOST_ARCH_STR=`echo $CFG_HOST_ARCH | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF -/* Machine Architecture */ -#ifndef QT_BOOTSTRAPPED -# define QT_ARCH_${CFG_ARCH_STR} -#else -# define QT_ARCH_${CFG_HOST_ARCH_STR} -#endif -EOF - -echo '/* Compile time features */' >>"$outpath/src/corelib/global/qconfig.h.new" -[ '!' -z "$LicenseKeyExt" ] && echo "#define QT_PRODUCT_LICENSEKEY \"$LicenseKeyExt\"" >>"$outpath/src/corelib/global/qconfig.h.new" - -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 - -if [ "$PLATFORM_MAC" = "yes" ]; then - cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF -#if defined(__LP64__) -# define QT_POINTER_SIZE 8 -#else -# define QT_POINTER_SIZE 4 -#endif -EOF -else - "$unixtests/ptrsize.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" - echo "#define QT_POINTER_SIZE $?" >>"$outpath/src/corelib/global/qconfig.h.new" -fi - - -echo "" >>"$outpath/src/corelib/global/qconfig.h.new" - -if [ "$CFG_DEV" = "yes" ]; then - echo "#define QT_BUILD_INTERNAL" >>"$outpath/src/corelib/global/qconfig.h.new" -fi - -# Embedded compile time options -if [ "$PLATFORM_QWS" = "yes" ]; then - # Add QWS to config.h - QCONFIG_FLAGS="$QCONFIG_FLAGS Q_WS_QWS" - - # Add excluded decorations to $QCONFIG_FLAGS - decors=`grep '^decorations -= ' "$QMAKE_VARS_FILE" | ${AWK} '{print $3}'` - for decor in $decors; do - NODECORATION=`echo $decor | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - QCONFIG_FLAGS="${QCONFIG_FLAGS} QT_NO_QWS_DECORATION_${NODECORATION}" - done - - # Figure which embedded drivers which are turned off - CFG_GFX_OFF="$CFG_GFX_AVAILABLE" - for ADRIVER in $CFG_GFX_ON; do - CFG_GFX_OFF=`echo "${CFG_GFX_OFF} " | sed "s,${ADRIVER} ,,g"` - done - - CFG_KBD_OFF="$CFG_KBD_AVAILABLE" - # the um driver is currently not in the available list for external builds - if [ "$CFG_DEV" = "no" ]; then - CFG_KBD_OFF="$CFG_KBD_OFF um" - fi - for ADRIVER in $CFG_KBD_ON; do - CFG_KBD_OFF=`echo "${CFG_KBD_OFF} " | sed "s,${ADRIVER} ,,g"` - done - - CFG_MOUSE_OFF="$CFG_MOUSE_AVAILABLE" - for ADRIVER in $CFG_MOUSE_ON; do - CFG_MOUSE_OFF=`echo "${CFG_MOUSE_OFF} " | sed "s,${ADRIVER} ,,g"` - done - - for DRIVER in $CFG_GFX_OFF; do - NODRIVER=`echo $DRIVER | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_QWS_$NODRIVER" - done - - for DRIVER in $CFG_KBD_OFF; do - NODRIVER=`echo $DRIVER | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_QWS_KBD_$NODRIVER" - done - - for DRIVER in $CFG_MOUSE_OFF; do - NODRIVER=`echo $DRIVER | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_QWS_MOUSE_$NODRIVER" - done -fi # QWS - -if [ "${CFG_USE_FLOATMATH}" = "yes" ]; then - QCONFIG_FLAGS="${QCONFIG_FLAGS} QT_USE_MATH_H_FLOATS" -fi - -# Add turned on SQL drivers -for DRIVER in $CFG_SQL_AVAILABLE; do - eval "VAL=\$CFG_SQL_$DRIVER" - case "$VAL" in - qt) - ONDRIVER=`echo $DRIVER | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_SQL_$ONDRIVER" - SQL_DRIVERS="$SQL_DRIVERS $DRIVER" - ;; - plugin) - SQL_PLUGINS="$SQL_PLUGINS $DRIVER" - ;; - esac -done - - -QMakeVar set sql-drivers "$SQL_DRIVERS" -QMakeVar set sql-plugins "$SQL_PLUGINS" - -# Add other configuration options to the qconfig.h file -[ "$CFG_GIF" = "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_BUILTIN_GIF_READER=1" -[ "$CFG_TIFF" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_TIFF" -[ "$CFG_PNG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_PNG" -[ "$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_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" -[ "$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" -[ "$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_XSYNC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XSYNC" -[ "$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` -QCONFIG_FLAGS=`echo $QCONFIG_FLAGS` - -if [ -n "$QCONFIG_FLAGS" ]; then - for cfg in $QCONFIG_FLAGS; do - cfgd=`echo $cfg | sed 's/=.*$//'` # trim pushed 'Foo=Bar' defines - cfg=`echo $cfg | sed 's/=/ /'` # turn first '=' into a space - # figure out define logic, so we can output the correct - # ifdefs to override the global defines in a project - cfgdNeg= - if [ true ] && echo "$cfgd" | grep 'QT_NO_' >/dev/null 2>&1; then - # QT_NO_option can be forcefully turned on by QT_option - cfgdNeg=`echo $cfgd | sed "s,QT_NO_,QT_,"` - elif [ true ] && echo "$cfgd" | grep 'QT_' >/dev/null 2>&1; then - # QT_option can be forcefully turned off by QT_NO_option - cfgdNeg=`echo $cfgd | sed "s,QT_,QT_NO_,"` - fi - - if [ -z $cfgdNeg ]; then -cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF -#ifndef $cfgd -# define $cfg -#endif - -EOF - else -cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF -#if defined($cfgd) && defined($cfgdNeg) -# undef $cfgd -#elif !defined($cfgd) && !defined($cfgdNeg) -# define $cfg -#endif - -EOF - fi - done -fi - -if [ "$CFG_REDUCE_EXPORTS" = "yes" ]; then -cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF -#define QT_VISIBILITY_AVAILABLE - -EOF -fi - -# avoid unecessary rebuilds by copying only if qconfig.h has changed -if cmp -s "$outpath/src/corelib/global/qconfig.h" "$outpath/src/corelib/global/qconfig.h.new"; then - rm -f "$outpath/src/corelib/global/qconfig.h.new" -else - [ -f "$outpath/src/corelib/global/qconfig.h" ] && chmod +w "$outpath/src/corelib/global/qconfig.h" - mv "$outpath/src/corelib/global/qconfig.h.new" "$outpath/src/corelib/global/qconfig.h" - chmod -w "$outpath/src/corelib/global/qconfig.h" - for conf in "$outpath/include/QtCore/qconfig.h" "$outpath/include/Qt/qconfig.h"; do - if [ '!' -f "$conf" ]; then - ln -s "$outpath/src/corelib/global/qconfig.h" "$conf" - fi - done -fi - -#------------------------------------------------------------------------------- -# save configuration into qconfig.pri -#------------------------------------------------------------------------------- - -QTCONFIG="$outpath/mkspecs/qconfig.pri" -QTCONFIG_CONFIG="$QTCONFIG_CONFIG no_mocdepend" -[ -f "$QTCONFIG.tmp" ] && rm -f "$QTCONFIG.tmp" -if [ "$CFG_DEBUG" = "yes" ]; then - QTCONFIG_CONFIG="$QTCONFIG_CONFIG debug" - if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then - QT_CONFIG="$QT_CONFIG release" - fi - QT_CONFIG="$QT_CONFIG debug" -elif [ "$CFG_DEBUG" = "no" ]; then - QTCONFIG_CONFIG="$QTCONFIG_CONFIG release" - if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then - QT_CONFIG="$QT_CONFIG debug" - fi - QT_CONFIG="$QT_CONFIG release" -fi -if [ "$CFG_STL" = "yes" ]; then - QTCONFIG_CONFIG="$QTCONFIG_CONFIG stl" -fi -if [ "$CFG_FRAMEWORK" = "no" ]; then - QTCONFIG_CONFIG="$QTCONFIG_CONFIG qt_no_framework" -else - QT_CONFIG="$QT_CONFIG qt_framework" - QTCONFIG_CONFIG="$QTCONFIG_CONFIG qt_framework" -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 -QT_ARCH = $CFG_ARCH -QT_EDITION = $Edition -QT_CONFIG += $QT_CONFIG - -#versioning -QT_VERSION = $QT_VERSION -QT_MAJOR_VERSION = $QT_MAJOR_VERSION -QT_MINOR_VERSION = $QT_MINOR_VERSION -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" -else - mv -f "$QTCONFIG.tmp" "$QTCONFIG" -fi - -#------------------------------------------------------------------------------- -# save configuration into .qmake.cache -#------------------------------------------------------------------------------- - -CACHEFILE="$outpath/.qmake.cache" -[ -f "$CACHEFILE.tmp" ] && rm -f "$CACHEFILE.tmp" -cat >>"$CACHEFILE.tmp" <<EOF -CONFIG += $QMAKE_CONFIG dylib create_prl link_prl depend_includepath fix_output_dirs QTDIR_build -QT_SOURCE_TREE = \$\$quote($relpath) -QT_BUILD_TREE = \$\$quote($outpath) -QT_BUILD_PARTS = $CFG_BUILD_PARTS -QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE -QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc - -#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR -QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc -QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic -QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3 -QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc -QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp -QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include -QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib - -EOF - -if [ -n "$QT_CFLAGS_PSQL" ]; then - echo "QT_CFLAGS_PSQL = $QT_CFLAGS_PSQL" >> "$CACHEFILE.tmp" -fi -if [ -n "$QT_LFLAGS_PSQL" ]; then - echo "QT_LFLAGS_PSQL = $QT_LFLAGS_PSQL" >> "$CACHEFILE.tmp" -fi -if [ -n "$QT_CFLAGS_MYSQL" ]; then - echo "QT_CFLAGS_MYSQL = $QT_CFLAGS_MYSQL" >> "$CACHEFILE.tmp" -fi -if [ -n "$QT_LFLAGS_MYSQL" ]; then - echo "QT_LFLAGS_MYSQL = $QT_LFLAGS_MYSQL" >> "$CACHEFILE.tmp" -fi -if [ -n "$QT_CFLAGS_SQLITE" ]; then - echo "QT_CFLAGS_SQLITE = $QT_CFLAGS_SQLITE" >> "$CACHEFILE.tmp" -fi -if [ -n "$QT_LFLAGS_SQLITE" ]; then - echo "QT_LFLAGS_SQLITE = $QT_LFLAGS_SQLITE" >> "$CACHEFILE.tmp" -fi - -if [ "$QT_EDITION" != "QT_EDITION_OPENSOURCE" ]; then - echo "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" >> "$CACHEFILE.tmp" -fi - -#dump in the OPENSSL_LIBS info -if [ '!' -z "$OPENSSL_LIBS" ]; then - echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$CACHEFILE.tmp" -elif [ "$CFG_OPENSSL" = "linked" ]; then - echo "OPENSSL_LIBS = -lssl -lcrypto" >> "$CACHEFILE.tmp" -fi - -#dump in the SDK info -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" -else - echo "QMAKESPEC = $XPLATFORM" >> "$CACHEFILE.tmp" -fi - -# cmdline args -cat "$QMAKE_VARS_FILE" >> "$CACHEFILE.tmp" -rm -f "$QMAKE_VARS_FILE" 2>/dev/null - -# incrementals -INCREMENTAL="" -[ "$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 - [ -r `echo $f | sed "s,cpp$,ui,"` ] && continue - basename "$f" | grep '^moc_' >/dev/null 2>&1 && continue - # done - INCREMENTAL="$INCREMENTAL `basename \"$f\" | sed 's,.cpp,.o,'`" - done - [ '!' -z "$INCREMENTAL" ] && echo "QMAKE_INCREMENTAL += $INCREMENTAL" >> "$CACHEFILE.tmp" - [ -r "$outpath/.qmake.incremental" ] && echo "include($outpath/.qmake.incremental)" >> "$CACHEFILE.tmp" -fi - -# replace .qmake.cache if it differs from the newly created temp file -if cmp -s "$CACHEFILE.tmp" "$CACHEFILE"; then - rm -f "$CACHEFILE.tmp" -else - mv -f "$CACHEFILE.tmp" "$CACHEFILE" -fi - -#------------------------------------------------------------------------------- -# give feedback on configuration -#------------------------------------------------------------------------------- - -case "$COMPILER" in -g++*) - if [ "$CFG_EXCEPTIONS" != "no" ]; then - cat <<EOF - - This target is using the GNU C++ compiler ($PLATFORM). - - Recent versions of this compiler automatically include code for - exceptions, which increase both the size of the Qt libraries and - the amount of memory taken by your applications. - - You may choose to re-run `basename $0` with the -no-exceptions - option to compile Qt without exceptions. This is completely binary - compatible, and existing applications will continue to work. - -EOF - fi - ;; -cc*) - case "$PLATFORM" in - irix-cc*) - if [ "$CFG_EXCEPTIONS" != "no" ]; then - cat <<EOF - - This target is using the MIPSpro C++ compiler ($PLATFORM). - - You may choose to re-run `basename $0` with the -no-exceptions - option to compile Qt without exceptions. This will make the - size of the Qt library smaller and reduce the amount of memory - taken by your applications. - -EOF - fi - ;; - *) ;; - esac - ;; -*) ;; -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" -else - echo "Building on: $PLATFORM" - echo "Building for: $XPLATFORM" -fi - -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" -else - echo -fi - -if [ "$OPT_VERBOSE" = "yes" ]; then - if echo '\c' | grep '\c' >/dev/null; then - echo -n "qmake vars .......... " - else - echo "qmake vars .......... \c" - fi - cat "$QMAKE_VARS_FILE" | tr '\n' ' ' - echo "qmake switches ...... $QMAKE_SWITCHES" -fi - -[ "$CFG_INCREMENTAL" = "yes" ] && [ '!' -z "$INCREMENTAL" ] && echo "Incremental ......... $INCREMENTAL" -echo "Build ............... $CFG_BUILD_PARTS" -echo "Configuration ....... $QMAKE_CONFIG $QT_CONFIG" -if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then - echo "Debug ............... yes (combined)" - if [ "$CFG_DEBUG" = "yes" ]; then - echo "Default Link ........ debug" - else - echo "Default Link ........ release" - fi -else - echo "Debug ............... $CFG_DEBUG" -fi -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 "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" -echo "getifaddrs support .. $CFG_GETIFADDRS" -echo "Accessibility ....... $CFG_ACCESSIBILITY" -echo "NIS support ......... $CFG_NIS" -echo "CUPS support ........ $CFG_CUPS" -echo "Iconv support ....... $CFG_ICONV" -echo "Glib support ........ $CFG_GLIB" -echo "GStreamer support ... $CFG_GSTREAMER" -echo "Large File support .. $CFG_LARGEFILE" -echo "GIF support ......... $CFG_GIF" -if [ "$CFG_TIFF" = "no" ]; then - echo "TIFF support ........ $CFG_TIFF" -else - echo "TIFF support ........ $CFG_TIFF ($CFG_LIBTIFF)" -fi -if [ "$CFG_JPEG" = "no" ]; then - echo "JPEG support ........ $CFG_JPEG" -else - echo "JPEG support ........ $CFG_JPEG ($CFG_LIBJPEG)" -fi -if [ "$CFG_PNG" = "no" ]; then - echo "PNG support ......... $CFG_PNG" -else - echo "PNG support ......... $CFG_PNG ($CFG_LIBPNG)" -fi -if [ "$CFG_MNG" = "no" ]; then - echo "MNG support ......... $CFG_MNG" -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 - echo "Freetype2 support ... $CFG_QWS_FREETYPE ($CFG_LIBFREETYPE)" - else - echo "Freetype2 support ... $CFG_QWS_FREETYPE" - fi - # Normalize the decoration output first - CFG_GFX_ON=`echo ${CFG_GFX_ON}` - CFG_GFX_PLUGIN=`echo ${CFG_GFX_PLUGIN}` - echo "Graphics (qt) ....... ${CFG_GFX_ON}" - echo "Graphics (plugin) ... ${CFG_GFX_PLUGIN}" - CFG_DECORATION_ON=`echo ${CFG_DECORATION_ON}` - CFG_DECORATION_PLUGIN=`echo ${CFG_DECORATION_PLUGIN}` - echo "Decorations (qt) .... $CFG_DECORATION_ON" - echo "Decorations (plugin) $CFG_DECORATION_PLUGIN" - CFG_KBD_ON=`echo ${CFG_KBD_ON}` - CFG_KBD_PLUGIN=`echo ${CFG_KBD_PLUGIN}` - echo "Keyboard driver (qt). ${CFG_KBD_ON}" - echo "Keyboard driver (plugin) ${CFG_KBD_PLUGIN}" - CFG_MOUSE_ON=`echo ${CFG_MOUSE_ON}` - CFG_MOUSE_PLUGIN=`echo ${CFG_MOUSE_PLUGIN}` - echo "Mouse driver (qt) ... $CFG_MOUSE_ON" - echo "Mouse driver (plugin) $CFG_MOUSE_PLUGIN" -fi -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 "XShape support ...... $CFG_XSHAPE" - echo "XSync support ....... $CFG_XSYNC" - 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" -[ "$CFG_SQL_odbc" != "no" ] && echo "ODBC support ........ $CFG_SQL_odbc" -[ "$CFG_SQL_oci" != "no" ] && echo "OCI support ......... $CFG_SQL_oci" -[ "$CFG_SQL_tds" != "no" ] && echo "TDS support ......... $CFG_SQL_tds" -[ "$CFG_SQL_db2" != "no" ] && echo "DB2 support ......... $CFG_SQL_db2" -[ "$CFG_SQL_ibase" != "no" ] && echo "InterBase support ... $CFG_SQL_ibase" -[ "$CFG_SQL_sqlite2" != "no" ] && echo "SQLite 2 support .... $CFG_SQL_sqlite2" -[ "$CFG_SQL_sqlite" != "no" ] && echo "SQLite support ...... $CFG_SQL_sqlite ($CFG_SQLITE)" - -OPENSSL_LINKAGE="" -if [ "$CFG_OPENSSL" = "yes" ]; then - OPENSSL_LINKAGE="(run-time)" -elif [ "$CFG_OPENSSL" = "linked" ]; then - OPENSSL_LINKAGE="(linked)" -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 - echo "WARNING: Using static linking will disable the use of dynamically" - echo "loaded plugins. Make sure to import all needed static plugins," - echo "or compile needed modules into the library." - echo -fi -if [ "$CFG_OPENSSL" = "linked" ] && [ "$OPENSSL_LIBS" = "" ]; then - echo - echo "NOTE: When linking against OpenSSL, you can override the default" - echo "library names through OPENSSL_LIBS." - echo "For example:" - echo " ./configure -openssl-linked OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto'" - echo -fi -if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_DEBUG" = "yes" ] && [ "$CFG_DEBUG_RELEASE" = "no" ]; then - echo - echo "NOTE: Mac OS X frameworks implicitly build debug and release Qt libraries." - echo -fi -echo - -sepath=`echo "$relpath" | sed -e 's/\\./\\\\./g'` -PROCS=1 -EXEC="" - - -#------------------------------------------------------------------------------- -# build makefiles based on the configuration -#------------------------------------------------------------------------------- - -echo "Finding project files. Please wait..." -"$outpath/bin/qmake" -prl -r "${relpath}/projects.pro" -if [ -f "${relpath}/projects.pro" ]; then - mkfile="${outpath}/Makefile" - [ -f "$mkfile" ] && chmod +w "$mkfile" - QTDIR="$outpath" qmake-qt4 -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile" -fi - -# .projects -> projects to process -# .projects.1 -> qt and moc -# .projects.2 -> subdirs and libs -# .projects.3 -> the rest -rm -f .projects .projects.1 .projects.2 .projects.3 - -QMAKE_PROJECTS=`find "$relpath/." -name '*.pro' -print | sed 's-/\./-/-'` -if [ -z "$AWK" ]; then - for p in `echo $QMAKE_PROJECTS`; do - echo "$p" >> .projects - done -else - cat >projects.awk <<EOF -BEGIN { - files = 0 - target_file = "" - input_file = "" - - first = "./.projects.1.tmp" - second = "./.projects.2.tmp" - third = "./.projects.3.tmp" -} - -FNR == 1 { - if ( input_file ) { - if ( ! target_file ) - target_file = third - print input_file >target_file - } - - matched_target = 0 - template_lib = 0 - input_file = FILENAME - target_file = "" -} - -/^(TARGET.*=)/ { - if ( \$3 == "moc" || \$3 ~ /^Qt/ ) { - target_file = first - matched_target = 1 - } -} - -matched_target == 0 && /^(TEMPLATE.*=)/ { - if ( \$3 == "subdirs" ) - target_file = second - else if ( \$3 == "lib" ) - template_lib = 1 - else - target_file = third -} - -matched_target == 0 && template_lib == 1 && /^(CONFIG.*=)/ { - if ( \$0 ~ /plugin/ ) - target_file = third - else - target_file = second -} - -END { - if ( input_file ) { - if ( ! target_file ) - target_file = third - print input_file >>target_file - } -} - -EOF - - rm -f .projects.all - for p in `echo $QMAKE_PROJECTS`; do - echo "$p" >> .projects.all - done - - # if you get errors about the length of the command line to awk, change the -l arg - # to split below - split -l 100 .projects.all .projects.all. - for p in .projects.all.*; do - "$AWK" -f projects.awk `cat $p` - [ -f .projects.1.tmp ] && cat .projects.1.tmp >> .projects.1 - [ -f .projects.2.tmp ] && cat .projects.2.tmp >> .projects.2 - [ -f .projects.3.tmp ] && cat .projects.3.tmp >> .projects.3 - rm -f .projects.1.tmp .projects.2.tmp .projects.3.tmp $p - done - rm -f .projects.all* projects.awk - - [ -f .projects.1 ] && cat .projects.1 >>.projects - [ -f .projects.2 ] && cat .projects.2 >>.projects - rm -f .projects.1 .projects.2 - if [ -f .projects.3 ] && [ "$OPT_FAST" = "no" ]; then - cat .projects.3 >>.projects - rm -f .projects.3 - fi -fi -# don't sort Qt and MOC in with the other project files -# also work around a segfaulting uniq(1) -if [ -f .sorted.projects.2 ]; then - sort .sorted.projects.2 > .sorted.projects.2.new - mv -f .sorted.projects.2.new .sorted.projects.2 - cat .sorted.projects.2 >> .sorted.projects.1 -fi -[ -f .sorted.projects.1 ] && sort .sorted.projects.1 >> .sorted.projects -rm -f .sorted.projects.2 .sorted.projects.1 - -NORM_PROJECTS=0 -FAST_PROJECTS=0 -if [ -f .projects ]; then - uniq .projects >.tmp - mv -f .tmp .projects - NORM_PROJECTS=`cat .projects | wc -l | sed -e "s, ,,g"` -fi -if [ -f .projects.3 ]; then - uniq .projects.3 >.tmp - mv -f .tmp .projects.3 - FAST_PROJECTS=`cat .projects.3 | wc -l | sed -e "s, ,,g"` -fi -echo " `expr $NORM_PROJECTS + $FAST_PROJECTS` projects found." -echo - -PART_ROOTS= -for part in $CFG_BUILD_PARTS; do - case "$part" in - tools) PART_ROOTS="$PART_ROOTS tools" ;; - libs) PART_ROOTS="$PART_ROOTS src" ;; - examples) PART_ROOTS="$PART_ROOTS examples demos" ;; - *) ;; - esac -done - -if [ "$CFG_DEV" = "yes" ]; then - PART_ROOTS="$PART_ROOTS tests" -fi - -echo "Creating makefiles. Please wait..." -for file in .projects .projects.3; do - [ '!' -f "$file" ] && continue - for a in `cat $file`; do - IN_ROOT=no - for r in $PART_ROOTS; do - if echo "$a" | grep "^$r" >/dev/null 2>&1 || echo "$a" | grep "^$relpath/$r" >/dev/null 2>&1; then - IN_ROOT=yes - break - fi - done - [ "$IN_ROOT" = "no" ] && continue - - case $a in - *winmain/winmain.pro) continue ;; - */qmake/qmake.pro) continue ;; - *tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*) SPEC=$QMAKESPEC ;; - *) SPEC=$XQMAKESPEC ;; - esac - dir=`dirname $a | sed -e "s;$sepath;.;g"` - test -d "$dir" || mkdir -p "$dir" - OUTDIR="$outpath/$dir" - if [ -f "${OUTDIR}/Makefile" ] && [ "$OPT_FAST" = "yes" ]; then - # fast configure - the makefile exists, skip it - # since the makefile exists, it was generated by qmake, which means we - # can skip it, since qmake has a rule to regenerate the makefile if the .pro - # file changes... - [ "$OPT_VERBOSE" = "yes" ] && echo " skipping $a" - continue; - fi - QMAKE_SPEC_ARGS="-spec $SPEC" - if echo '\c' | grep '\c' >/dev/null; then - echo -n " for $a" - else - echo " for $a\c" - fi - - QMAKE="qmake-qt4" - QMAKE_ARGS="$QMAKE_SWITCHES $QMAKE_SPEC_ARGS" - if [ "$file" = ".projects.3" ]; then - if echo '\c' | grep '\c' >/dev/null; then - echo -n " (fast)" - else - echo " (fast)\c" - fi - echo - - cat >"${OUTDIR}/Makefile" <<EOF -# ${OUTDIR}/Makefile: generated by configure -# -# WARNING: This makefile will be replaced with a real makefile. -# All changes made to this file will be lost. -EOF - [ "$CFG_DEBUG_RELEASE" = "no" ] && echo "first_target: first" >>${OUTDIR}/Makefile - - cat >>"${OUTDIR}/Makefile" <<EOF -QMAKE = "$QMAKE" -all clean install qmake first Makefile: FORCE - \$(QMAKE) $QMAKE_ARGS -o "$OUTDIR" "$a" - cd "$OUTDIR" - \$(MAKE) \$@ - -FORCE: - -EOF - else - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " (`basename $SPEC`)" - echo "$QMAKE" $QMAKE_ARGS -o "$OUTDIR" "$a" - else - echo - fi - - [ -f "${OUTDIR}/Makefile" ] && chmod +w "${OUTDIR}/Makefile" - QTDIR="$outpath" "$QMAKE" $QMAKE_ARGS -o "$OUTDIR" "$a" - fi - done -done -rm -f .projects .projects.3 - -#------------------------------------------------------------------------------- -# XShape is important, DnD in the Designer doens't work without it -#------------------------------------------------------------------------------- -if [ "$PLATFORM_X11" = "yes" ] && [ "$CFG_XSHAPE" = "no" ]; then - cat <<EOF - - NOTICE: Qt will not be built with XShape support. - - As a result, drag-and-drop in the Qt Designer will NOT - work. We recommend that you enable XShape support by passing - the -xshape switch to $0. -EOF -fi - -#------------------------------------------------------------------------------- -# check for platforms that we don't yet know about -#------------------------------------------------------------------------------- -if [ "$CFG_ARCH" = "generic" ]; then -cat <<EOF - - NOTICE: Atomic operations are not yet supported for this - architecture. - - Qt will use the 'generic' architecture instead, which uses a - single pthread_mutex_t to protect all atomic operations. This - implementation is the slow (but safe) fallback implementation - for architectures Qt does not yet support. -EOF -fi - -#------------------------------------------------------------------------------- -# check if the user passed the -no-zlib option, which is no longer supported -#------------------------------------------------------------------------------- -if [ -n "$ZLIB_FORCED" ]; then - which_zlib="supplied" - if [ "$CFG_ZLIB" = "system" ]; then - which_zlib="system" - fi - -cat <<EOF - - NOTICE: The -no-zlib option was supplied but is no longer - supported. - - Qt now requires zlib support in all builds, so the -no-zlib - option was ignored. Qt will be built using the $which_zlib - zlib. -EOF -fi - -#------------------------------------------------------------------------------- -# finally save the executed command to another script -#------------------------------------------------------------------------------- -if [ `basename $0` != "config.status" ]; then - CONFIG_STATUS="$relpath/$relconf $OPT_CMDLINE" - - # add the system variables - for varname in $SYSTEM_VARIABLES; do - cmd=`echo \ -'if [ -n "\$'${varname}'" ]; then - CONFIG_STATUS="'${varname}'='"'\\\$${varname}'"' \$CONFIG_STATUS" -fi'` - eval "$cmd" - done - - echo "$CONFIG_STATUS" | grep '\-confirm\-license' >/dev/null 2>&1 || CONFIG_STATUS="$CONFIG_STATUS -confirm-license" - - [ -f "$outpath/config.status" ] && rm -f "$outpath/config.status" - echo "#!/bin/sh" > "$outpath/config.status" - echo "if [ \"\$#\" -gt 0 ]; then" >> "$outpath/config.status" - echo " $CONFIG_STATUS \"\$@\"" >> "$outpath/config.status" - echo "else" >> "$outpath/config.status" - echo " $CONFIG_STATUS" >> "$outpath/config.status" - echo "fi" >> "$outpath/config.status" - chmod +x "$outpath/config.status" -fi - -if [ -n "$RPATH_MESSAGE" ]; then - echo - echo "$RPATH_MESSAGE" -fi - -MAKE=`basename $MAKE` -echo -echo Qt is now configured for building. Just run \'$MAKE\'. -if [ "$relpath" = "$QT_INSTALL_PREFIX" ]; then - echo Once everything is built, Qt is installed. - echo You should not run \'$MAKE install\'. -else - echo Once everything is built, you must run \'$MAKE install\'. - echo Qt will be installed into $QT_INSTALL_PREFIX -fi -echo -echo To reconfigure, run \'$MAKE confclean\' and \'configure\'. -echo diff --git a/devel/qt4/files/extrapatch-configure b/devel/qt4/files/extrapatch-configure deleted file mode 100644 index 8fff01cdb1ea..000000000000 --- a/devel/qt4/files/extrapatch-configure +++ /dev/null @@ -1,162 +0,0 @@ ---- ./configure.orig 2009-09-29 15:01:31.000000000 +0400 -+++ ./configure 2009-10-04 01:56:41.000000000 +0400 -@@ -2124,12 +2124,6 @@ - chmod 755 "$outpath/bin/syncqt" - fi - -- # symlink the mkspecs directory -- mkdir -p "$outpath/mkspecs" -- rm -f "$outpath"/mkspecs/* -- ln -s "$relpath"/mkspecs/* "$outpath/mkspecs" -- rm -f "$outpath/mkspecs/default" -- - # symlink the doc directory - rm -rf "$outpath/doc" - ln -s "$relpath/doc" "$outpath/doc" -@@ -2168,7 +2162,7 @@ - # find a make command - if [ -z "$MAKE" ]; then - MAKE= -- for mk in gmake make; do -+ for mk in make; do - if "$WHICH" $mk >/dev/null 2>&1; then - MAKE=`$WHICH $mk` - break -@@ -4069,7 +4063,7 @@ - } - - # build qmake --if true; then ###[ '!' -f "$outpath/bin/qmake" ]; -+if false; then ###[ '!' -f "$outpath/bin/qmake" ]; - echo "Creating qmake. Please wait..." - - OLD_QCONFIG_H= -@@ -4797,12 +4791,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 -@@ -5652,7 +5647,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 -@@ -5664,7 +5659,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 -@@ -6038,7 +6033,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 -@@ -6535,10 +6530,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" -@@ -6546,34 +6541,34 @@ - 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_XSYNC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XSYNC" --[ "$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_XSYNC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XSYNC" -+# [ "$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" -@@ -7084,7 +7079,7 @@ - if [ -f "${relpath}/projects.pro" ]; then - mkfile="${outpath}/Makefile" - [ -f "$mkfile" ] && chmod +w "$mkfile" -- QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile" -+ QTDIR="$outpath" qmake-qt4 -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile" - fi - - # .projects -> projects to process -@@ -7257,7 +7252,7 @@ - echo " for $a\c" - fi - -- QMAKE="$outpath/bin/qmake" -+ QMAKE="qmake-qt4" - QMAKE_ARGS="$QMAKE_SWITCHES $QMAKE_SPEC_ARGS" - if [ "$file" = ".projects.3" ]; then - if echo '\c' | grep '\c' >/dev/null; then diff --git a/devel/qt4/files/patch-configure b/devel/qt4/files/patch-configure new file mode 100644 index 000000000000..561fe8153583 --- /dev/null +++ b/devel/qt4/files/patch-configure @@ -0,0 +1,56 @@ +--- ./configure.orig 2010-01-15 20:01:30.000000000 +0300 ++++ ./configure 2010-01-20 10:20:34.848078900 +0300 +@@ -2261,11 +2261,6 @@ + chmod 755 "$outpath/bin/syncqt" + fi + +- # symlink the mkspecs directory +- mkdir -p "$outpath/mkspecs" +- rm -f "$outpath"/mkspecs/* +- ln -s "$relpath"/mkspecs/* "$outpath/mkspecs" +- rm -f "$outpath/mkspecs/default" + + # symlink the doc directory + rm -rf "$outpath/doc" +@@ -2296,7 +2291,7 @@ + # find a make command + if [ -z "$MAKE" ]; then + MAKE= +- for mk in gmake make; do ++ for mk in make; do + if "$WHICH" $mk >/dev/null 2>&1; then + MAKE=`"$WHICH" $mk` + break +@@ -2946,7 +2941,7 @@ + fi + + QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1` +-TEST_COMPILER="$CC" ++TEST_COMPILER="$CXX" + [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER + if [ -z "$TEST_COMPILER" ]; then + echo "ERROR: Cannot set the compiler for the configuration tests" +@@ -4296,7 +4291,7 @@ + } + + # build qmake +-if true; then ###[ '!' -f "$outpath/bin/qmake" ]; ++if false; then ###[ '!' -f "$outpath/bin/qmake" ]; + echo "Creating qmake. Please wait..." + + OLD_QCONFIG_H= +@@ -5059,14 +5054,6 @@ + X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive" + fi + +- # Check we actually have X11 :-) +- "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS +- if [ $? != "0" ]; 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 diff --git a/devel/qt4/pkg-descr b/devel/qt4/pkg-descr index 8c3b493aeefd..cb54e91e9d8f 100644 --- a/devel/qt4/pkg-descr +++ b/devel/qt4/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/graphics/qt4-iconengines/Makefile b/graphics/qt4-iconengines/Makefile index 77ade58473e7..3fbd8c784390 100644 --- a/graphics/qt4-iconengines/Makefile +++ b/graphics/qt4-iconengines/Makefile @@ -8,7 +8,6 @@ PORTNAME= iconengines PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= graphics PKGNAMEPREFIX= qt4- @@ -29,22 +28,26 @@ 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/script src/sql src/testlib \ - src/tools src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/multimedia src/network src/opengl \ + src/openvg src/phonon src/qt3support src/s60installs \ + src/s60main src/script src/scripttools src/sql src/testlib \ + src/tools src/winmain src/xml src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/plugins/iconengines/svgiconengine -CONFIGURE_WRKSRC=${WRKSRC}/../../../.. +BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/svgiconengine +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-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 + ${MKDIR} ${WRKSRC}/mkspecs + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake + ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc .include <bsd.port.mk> diff --git a/graphics/qt4-iconengines/pkg-descr b/graphics/qt4-iconengines/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/graphics/qt4-iconengines/pkg-descr +++ b/graphics/qt4-iconengines/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/graphics/qt4-iconengines/pkg-plist b/graphics/qt4-iconengines/pkg-plist index e3eafa6f386f..a4d1cee195a5 100644 --- a/graphics/qt4-iconengines/pkg-plist +++ b/graphics/qt4-iconengines/pkg-plist @@ -1,3 +1,4 @@ -lib/qt4/plugins/iconengines/libqsvgicon.so -%%DEBUG%%lib/qt4/plugins/iconengines/libqsvgicon.so.debug -@dirrmtry lib/qt4/plugins/iconengines +%%QT_PLUGINDIR_REL%%/iconengines/libqsvgicon.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/iconengines/libqsvgicon.so.debug +@dirrmtry %%QT_PLUGINDIR_REL%%/iconengines +@dirrmtry %%QT_PLUGINDIR_REL%% diff --git a/graphics/qt4-imageformats/Makefile b/graphics/qt4-imageformats/Makefile index 4fdfb4e9eaf1..9c21375da7ac 100644 --- a/graphics/qt4-imageformats/Makefile +++ b/graphics/qt4-imageformats/Makefile @@ -8,7 +8,6 @@ PORTNAME= imageformats PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= graphics PKGNAMEPREFIX= qt4- @@ -34,23 +33,27 @@ 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/script src/sql src/testlib \ - src/tools src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit -EXTRACT_AFTER_ARGS= |${TAR} -xf - + src/activeqt src/dbus src/multimedia src/network src/opengl \ + src/openvg src/phonon src/qt3support src/s60installs \ + src/s60main src/script src/scripttools src/sql src/testlib \ + src/tools src/winmain src/xml src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit +EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/plugins/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../.. +BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-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 - ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../../bin/rcc + ${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 .include <bsd.port.mk> diff --git a/graphics/qt4-imageformats/pkg-descr b/graphics/qt4-imageformats/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/graphics/qt4-imageformats/pkg-descr +++ b/graphics/qt4-imageformats/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/graphics/qt4-imageformats/pkg-plist b/graphics/qt4-imageformats/pkg-plist index 1b01f5eb0bca..5040b1e318f7 100644 --- a/graphics/qt4-imageformats/pkg-plist +++ b/graphics/qt4-imageformats/pkg-plist @@ -1,13 +1,14 @@ -lib/qt4/plugins/imageformats/libqgif.so -%%DEBUG%%lib/qt4/plugins/imageformats/libqgif.so.debug -lib/qt4/plugins/imageformats/libqjpeg.so -%%DEBUG%%lib/qt4/plugins/imageformats/libqjpeg.so.debug -lib/qt4/plugins/imageformats/libqmng.so -%%DEBUG%%lib/qt4/plugins/imageformats/libqmng.so.debug -lib/qt4/plugins/imageformats/libqsvg.so -%%DEBUG%%lib/qt4/plugins/imageformats/libqsvg.so.debug -lib/qt4/plugins/imageformats/libqtiff.so -%%DEBUG%%lib/qt4/plugins/imageformats/libqtiff.so.debug -lib/qt4/plugins/imageformats/libqico.so -%%DEBUG%%lib/qt4/plugins/imageformats/libqico.so.debug -@dirrmtry lib/qt4/plugins/imageformats +%%QT_PLUGINDIR_REL%%/imageformats/libqgif.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/imageformats/libqgif.so.debug +%%QT_PLUGINDIR_REL%%/imageformats/libqjpeg.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/imageformats/libqjpeg.so.debug +%%QT_PLUGINDIR_REL%%/imageformats/libqmng.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/imageformats/libqmng.so.debug +%%QT_PLUGINDIR_REL%%/imageformats/libqsvg.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/imageformats/libqsvg.so.debug +%%QT_PLUGINDIR_REL%%/imageformats/libqtiff.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/imageformats/libqtiff.so.debug +%%QT_PLUGINDIR_REL%%/imageformats/libqico.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/imageformats/libqico.so.debug +@dirrm %%QT_PLUGINDIR_REL%%/imageformats +@dirrmtry %%QT_PLUGINDIR_REL%% diff --git a/graphics/qt4-pixeltool/Makefile b/graphics/qt4-pixeltool/Makefile index ff8411bc8d4e..63a522876dbf 100644 --- a/graphics/qt4-pixeltool/Makefile +++ b/graphics/qt4-pixeltool/Makefile @@ -8,7 +8,6 @@ PORTNAME= pixeltool PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= graphics PKGNAMEPREFIX= qt4- @@ -29,24 +28,28 @@ 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/network src/opengl src/phonon \ - src/qt3support src/script src/sql src/svg src/testlib \ - src/tools src/xml src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/multimedia src/network src/opengl \ + src/openvg src/phonon src/qt3support src/s60installs \ + src/s60main src/script src/scripttools src/sql src/svg \ + src/testlib src/tools src/winmain src/xml src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../ +BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \ - ${WRKSRC}/${PORTNAME}.pro - ${MKDIR} ${WRKSRC}/../../mkspecs - ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake - ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc + ${BUILD_WRKSRC}/${PORTNAME}.pro + ${MKDIR} ${WRKSRC}/mkspecs + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake + ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc .include <bsd.port.mk> diff --git a/graphics/qt4-pixeltool/pkg-descr b/graphics/qt4-pixeltool/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/graphics/qt4-pixeltool/pkg-descr +++ b/graphics/qt4-pixeltool/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/graphics/qt4-svg/Makefile b/graphics/qt4-svg/Makefile index b63d06513b28..b880a95ad0e1 100644 --- a/graphics/qt4-svg/Makefile +++ b/graphics/qt4-svg/Makefile @@ -28,30 +28,34 @@ 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/script src/sql src/testlib \ - src/tools src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit +DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ + src/activeqt src/dbus src/multimedia src/network src/opengl \ + src/openvg src/phonon src/qt3support src/s60installs \ + src/s60main src/script src/scripttools src/sql src/testlib \ + src/tools src/winmain src/xmlpatterns src/3rdparty/clucene \ + src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ + src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ + src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../ +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-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 + ${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 + -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/QtSvg.pc + ${WRKSRC}/lib/pkgconfig/QtSvg.pc .include <bsd.port.mk> diff --git a/graphics/qt4-svg/pkg-descr b/graphics/qt4-svg/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/graphics/qt4-svg/pkg-descr +++ b/graphics/qt4-svg/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/graphics/qt4-svg/pkg-plist b/graphics/qt4-svg/pkg-plist index 3480db18360a..f7171bbbf1c3 100644 --- a/graphics/qt4-svg/pkg-plist +++ b/graphics/qt4-svg/pkg-plist @@ -20,6 +20,7 @@ lib/qt4/libQtSvg.so.%%SHLIB_SHVER%% lib/qt4/libQtSvg.so.%%SHLIB_VER%% %%DEBUG%%lib/qt4/libQtSvg.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtSvg.pc +@dirrmtry lib/qt4 @dirrm include/qt4/QtSvg @dirrmtry include/qt4/Qt @dirrmtry include/qt4 diff --git a/japanese/qt4-codecs-jp/Makefile b/japanese/qt4-codecs-jp/Makefile index a5f5978d08e0..42f3ff7e3829 100644 --- a/japanese/qt4-codecs-jp/Makefile +++ b/japanese/qt4-codecs-jp/Makefile @@ -29,21 +29,25 @@ 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/gui src/network src/opengl src/phonon \ - src/qt3support src/script src/sql src/svg src/testlib \ - src/tools src/xml src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/gui src/multimedia src/network \ + src/opengl src/openvg src/phonon src/qt3support \ + src/s60installs src/s60main src/script src/scripttools src/sql \ + src/svg src/testlib src/tools src/winmain src/xml \ + src/xmlpatterns src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/plugins/${PORTNAME}/jp -CONFIGURE_WRKSRC=${WRKSRC}/../../../.. +BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/jp +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} - ${MKDIR} ${WRKSRC}/../../../mkspecs - ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../../bin/qmake + ${MKDIR} ${WRKSRC}/mkspecs + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake .include <bsd.port.mk> diff --git a/japanese/qt4-codecs-jp/pkg-descr b/japanese/qt4-codecs-jp/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/japanese/qt4-codecs-jp/pkg-descr +++ b/japanese/qt4-codecs-jp/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/japanese/qt4-codecs-jp/pkg-plist b/japanese/qt4-codecs-jp/pkg-plist index 09338d7687df..510d83aa298b 100644 --- a/japanese/qt4-codecs-jp/pkg-plist +++ b/japanese/qt4-codecs-jp/pkg-plist @@ -1,3 +1,4 @@ -lib/qt4/plugins/codecs/libqjpcodecs.so -%%DEBUG%%lib/qt4/plugins/codecs/libqjpcodecs.so.debug -@dirrmtry lib/qt4/plugins/codecs +%%QT_PLUGINDIR_REL%%/codecs/libqjpcodecs.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/codecs/libqjpcodecs.so.debug +@dirrmtry %%QT_PLUGINDIR_REL%%/codecs +@dirrmtry %%QT_PLUGINDIR_REL%% diff --git a/korean/qt4-codecs-kr/Makefile b/korean/qt4-codecs-kr/Makefile index 147cde777c3b..32356bba8645 100644 --- a/korean/qt4-codecs-kr/Makefile +++ b/korean/qt4-codecs-kr/Makefile @@ -27,23 +27,26 @@ 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 qmake tools translations \ - src/dbus src/gui src/network src/opengl src/phonon \ - src/qt3support src/script src/sql src/svg src/testlib \ - src/tools src/xml src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit +DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ + src/activeqt src/dbus src/gui src/multimedia src/network \ + src/opengl src/openvg src/phonon src/qt3support \ + src/s60installs src/s60main src/script src/scripttools src/sql \ + src/svg src/testlib src/tools src/winmain src/xml \ + src/xmlpatterns src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/plugins/${PORTNAME}/kr -CONFIGURE_WRKSRC=${WRKSRC}/../../../.. +BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/kr +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} - ${MKDIR} ${WRKSRC}/../../../mkspecs - ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../../bin/qmake + ${MKDIR} ${WRKSRC}/mkspecs + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake .include <bsd.port.mk> - diff --git a/korean/qt4-codecs-kr/pkg-descr b/korean/qt4-codecs-kr/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/korean/qt4-codecs-kr/pkg-descr +++ b/korean/qt4-codecs-kr/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/korean/qt4-codecs-kr/pkg-plist b/korean/qt4-codecs-kr/pkg-plist index 1e19d68738bc..ee64e955ea5c 100644 --- a/korean/qt4-codecs-kr/pkg-plist +++ b/korean/qt4-codecs-kr/pkg-plist @@ -1,3 +1,4 @@ -lib/qt4/plugins/codecs/libqkrcodecs.so -%%DEBUG%%lib/qt4/plugins/codecs/libqkrcodecs.so.debug -@dirrmtry lib/qt4/plugins/codecs +%%QT_PLUGINDIR_REL%%/codecs/libqkrcodecs.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/codecs/libqkrcodecs.so.debug +@dirrmtry %%QT_PLUGINDIR_REL%%/codecs +@dirrmtry %%QT_PLUGINDIR_REL%% diff --git a/misc/qt4-doc/Makefile b/misc/qt4-doc/Makefile index 65a4f0203456..d01545d95b52 100644 --- a/misc/qt4-doc/Makefile +++ b/misc/qt4-doc/Makefile @@ -10,9 +10,11 @@ PORTNAME= doc PORTVERSION= ${QT4_VERSION} CATEGORIES?= misc PKGNAMEPREFIX= qt4- + MAINTAINER= kde@FreeBSD.org COMMENT= Multiplatform C++ application framework +USE_QT_VER= 4 QT_DIST= yes NO_BUILD= yes @@ -29,6 +31,4 @@ do-install: ${MKDIR} ${DOCSDIR} && \ ${CP} -Rp ${WRKSRC}/doc/html ${WRKSRC}/doc/qch ${DOCSDIR} -.include <bsd.port.pre.mk> -.include "${.CURDIR}/../../Mk/bsd.qt.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/misc/qt4-doc/pkg-descr b/misc/qt4-doc/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/misc/qt4-doc/pkg-descr +++ b/misc/qt4-doc/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/misc/qt4-doc/pkg-plist b/misc/qt4-doc/pkg-plist index 9eced06a0686..5daa43733db0 100644 --- a/misc/qt4-doc/pkg-plist +++ b/misc/qt4-doc/pkg-plist @@ -3,26 +3,116 @@ %%DOCSDIR%%/html/accelerators.html %%DOCSDIR%%/html/accessibility.html %%DOCSDIR%%/html/accessible.html +%%DOCSDIR%%/html/activeqt-comapp-comapp-pro.html +%%DOCSDIR%%/html/activeqt-comapp-main-cpp.html +%%DOCSDIR%%/html/activeqt-comapp.html +%%DOCSDIR%%/html/activeqt-container.html +%%DOCSDIR%%/html/activeqt-dotnet.html %%DOCSDIR%%/html/activeqt-dumpcpp.html %%DOCSDIR%%/html/activeqt-dumpdoc.html +%%DOCSDIR%%/html/activeqt-hierarchy-hierarchy-pro.html +%%DOCSDIR%%/html/activeqt-hierarchy-main-cpp.html +%%DOCSDIR%%/html/activeqt-hierarchy-objects-cpp.html +%%DOCSDIR%%/html/activeqt-hierarchy-objects-h.html +%%DOCSDIR%%/html/activeqt-hierarchy.html %%DOCSDIR%%/html/activeqt-idc.html +%%DOCSDIR%%/html/activeqt-menus-main-cpp.html +%%DOCSDIR%%/html/activeqt-menus-menus-cpp.html +%%DOCSDIR%%/html/activeqt-menus-menus-h.html +%%DOCSDIR%%/html/activeqt-menus-menus-pro.html +%%DOCSDIR%%/html/activeqt-menus.html +%%DOCSDIR%%/html/activeqt-multiple-ax1-h.html +%%DOCSDIR%%/html/activeqt-multiple-ax2-h.html +%%DOCSDIR%%/html/activeqt-multiple-main-cpp.html +%%DOCSDIR%%/html/activeqt-multiple-multiple-pro.html +%%DOCSDIR%%/html/activeqt-multiple.html +%%DOCSDIR%%/html/activeqt-opengl-glbox-cpp.html +%%DOCSDIR%%/html/activeqt-opengl-glbox-h.html +%%DOCSDIR%%/html/activeqt-opengl-globjwin-cpp.html +%%DOCSDIR%%/html/activeqt-opengl-globjwin-h.html +%%DOCSDIR%%/html/activeqt-opengl-main-cpp.html +%%DOCSDIR%%/html/activeqt-opengl-opengl-pro.html +%%DOCSDIR%%/html/activeqt-opengl.html +%%DOCSDIR%%/html/activeqt-qutlook-addressview-cpp.html +%%DOCSDIR%%/html/activeqt-qutlook-addressview-h.html +%%DOCSDIR%%/html/activeqt-qutlook-main-cpp.html +%%DOCSDIR%%/html/activeqt-qutlook-qutlook-pro.html +%%DOCSDIR%%/html/activeqt-qutlook.html +%%DOCSDIR%%/html/activeqt-server.html +%%DOCSDIR%%/html/activeqt-simple-main-cpp.html +%%DOCSDIR%%/html/activeqt-simple-simple-pro.html +%%DOCSDIR%%/html/activeqt-simple.html %%DOCSDIR%%/html/activeqt-testcon.html %%DOCSDIR%%/html/activeqt-tools.html +%%DOCSDIR%%/html/activeqt-webbrowser-main-cpp.html +%%DOCSDIR%%/html/activeqt-webbrowser-mainwindow-ui.html +%%DOCSDIR%%/html/activeqt-webbrowser-mainwindow-windowsmobile-ui.html +%%DOCSDIR%%/html/activeqt-webbrowser-webaxwidget-h.html +%%DOCSDIR%%/html/activeqt-webbrowser-webbrowser-pro.html +%%DOCSDIR%%/html/activeqt-webbrowser.html +%%DOCSDIR%%/html/activeqt-wrapper-main-cpp.html +%%DOCSDIR%%/html/activeqt-wrapper-wrapper-pro.html +%%DOCSDIR%%/html/activeqt-wrapper.html %%DOCSDIR%%/html/activeqt.html %%DOCSDIR%%/html/advanced.html +%%DOCSDIR%%/html/animation-animatedtiles-animatedtiles-pro.html +%%DOCSDIR%%/html/animation-animatedtiles-animatedtiles-qrc.html +%%DOCSDIR%%/html/animation-animatedtiles-images-centered-png.html +%%DOCSDIR%%/html/animation-animatedtiles-images-ellipse-png.html +%%DOCSDIR%%/html/animation-animatedtiles-images-figure8-png.html +%%DOCSDIR%%/html/animation-animatedtiles-images-kinetic-png.html +%%DOCSDIR%%/html/animation-animatedtiles-images-random-png.html +%%DOCSDIR%%/html/animation-animatedtiles-images-tile-png.html +%%DOCSDIR%%/html/animation-animatedtiles-main-cpp.html +%%DOCSDIR%%/html/animation-animatedtiles.html +%%DOCSDIR%%/html/animation-appchooser-appchooser-pro.html +%%DOCSDIR%%/html/animation-appchooser-appchooser-qrc.html +%%DOCSDIR%%/html/animation-appchooser-main-cpp.html +%%DOCSDIR%%/html/animation-appchooser.html +%%DOCSDIR%%/html/animation-easing-animation-h.html +%%DOCSDIR%%/html/animation-easing-easing-pro.html +%%DOCSDIR%%/html/animation-easing-easing-qrc.html +%%DOCSDIR%%/html/animation-easing-form-ui.html +%%DOCSDIR%%/html/animation-easing-images-qt-logo-png.html +%%DOCSDIR%%/html/animation-easing-main-cpp.html +%%DOCSDIR%%/html/animation-easing-window-cpp.html +%%DOCSDIR%%/html/animation-easing-window-h.html +%%DOCSDIR%%/html/animation-easing.html +%%DOCSDIR%%/html/animation-moveblocks-main-cpp.html +%%DOCSDIR%%/html/animation-moveblocks-moveblocks-pro.html +%%DOCSDIR%%/html/animation-moveblocks.html +%%DOCSDIR%%/html/animation-overview.html +%%DOCSDIR%%/html/animation-states-main-cpp.html +%%DOCSDIR%%/html/animation-states-states-pro.html +%%DOCSDIR%%/html/animation-states-states-qrc.html +%%DOCSDIR%%/html/animation-states.html +%%DOCSDIR%%/html/animation-stickman-animation-cpp.html +%%DOCSDIR%%/html/animation-stickman-animation-h.html +%%DOCSDIR%%/html/animation-stickman-graphicsview-cpp.html +%%DOCSDIR%%/html/animation-stickman-graphicsview-h.html +%%DOCSDIR%%/html/animation-stickman-lifecycle-cpp.html +%%DOCSDIR%%/html/animation-stickman-lifecycle-h.html +%%DOCSDIR%%/html/animation-stickman-main-cpp.html +%%DOCSDIR%%/html/animation-stickman-node-cpp.html +%%DOCSDIR%%/html/animation-stickman-node-h.html +%%DOCSDIR%%/html/animation-stickman-stickman-cpp.html +%%DOCSDIR%%/html/animation-stickman-stickman-h.html +%%DOCSDIR%%/html/animation-stickman-stickman-pro.html +%%DOCSDIR%%/html/animation-stickman-stickman-qrc.html +%%DOCSDIR%%/html/animation-stickman.html +%%DOCSDIR%%/html/animation.html %%DOCSDIR%%/html/annotated.html %%DOCSDIR%%/html/appearance.html %%DOCSDIR%%/html/appicon.html -%%DOCSDIR%%/html/application.html -%%DOCSDIR%%/html/architecture.html +%%DOCSDIR%%/html/application-windows.html %%DOCSDIR%%/html/assistant-custom-help-viewer.html %%DOCSDIR%%/html/assistant-details.html %%DOCSDIR%%/html/assistant-manual.html %%DOCSDIR%%/html/assistant.dcf %%DOCSDIR%%/html/atomic-operations.html %%DOCSDIR%%/html/basicwidgets.html +%%DOCSDIR%%/html/best-practices.html %%DOCSDIR%%/html/bughowto.html -%%DOCSDIR%%/html/buildsystem.html %%DOCSDIR%%/html/classes.html %%DOCSDIR%%/html/classic.css %%DOCSDIR%%/html/classlists.html @@ -109,6 +199,7 @@ %%DOCSDIR%%/html/demos-books-bookwindow-cpp.html %%DOCSDIR%%/html/demos-books-bookwindow-h.html %%DOCSDIR%%/html/demos-books-bookwindow-ui.html +%%DOCSDIR%%/html/demos-books-images-star-png.html %%DOCSDIR%%/html/demos-books-initdb-h.html %%DOCSDIR%%/html/demos-books-main-cpp.html %%DOCSDIR%%/html/demos-books.html @@ -119,8 +210,6 @@ %%DOCSDIR%%/html/demos-boxes-glbuffers-h.html %%DOCSDIR%%/html/demos-boxes-glextensions-cpp.html %%DOCSDIR%%/html/demos-boxes-glextensions-h.html -%%DOCSDIR%%/html/demos-boxes-glshaders-cpp.html -%%DOCSDIR%%/html/demos-boxes-glshaders-h.html %%DOCSDIR%%/html/demos-boxes-gltrianglemesh-h.html %%DOCSDIR%%/html/demos-boxes-main-cpp.html %%DOCSDIR%%/html/demos-boxes-qtbox-cpp.html @@ -131,7 +220,6 @@ %%DOCSDIR%%/html/demos-boxes-scene-h.html %%DOCSDIR%%/html/demos-boxes-trackball-cpp.html %%DOCSDIR%%/html/demos-boxes-trackball-h.html -%%DOCSDIR%%/html/demos-boxes-vector-h.html %%DOCSDIR%%/html/demos-boxes.html %%DOCSDIR%%/html/demos-browser.html %%DOCSDIR%%/html/demos-chip-chip-cpp.html @@ -156,6 +244,106 @@ %%DOCSDIR%%/html/demos-deform-pathdeform-cpp.html %%DOCSDIR%%/html/demos-deform-pathdeform-h.html %%DOCSDIR%%/html/demos-deform.html +%%DOCSDIR%%/html/demos-embedded-anomaly-anomaly-pro.html +%%DOCSDIR%%/html/demos-embedded-anomaly-src-addressbar-cpp.html +%%DOCSDIR%%/html/demos-embedded-anomaly-src-addressbar-h.html +%%DOCSDIR%%/html/demos-embedded-anomaly-src-anomaly-qrc.html +%%DOCSDIR%%/html/demos-embedded-anomaly-src-bookmarksview-cpp.html +%%DOCSDIR%%/html/demos-embedded-anomaly-src-bookmarksview-h.html +%%DOCSDIR%%/html/demos-embedded-anomaly-src-browserview-cpp.html +%%DOCSDIR%%/html/demos-embedded-anomaly-src-browserview-h.html +%%DOCSDIR%%/html/demos-embedded-anomaly-src-browserwindow-cpp.html +%%DOCSDIR%%/html/demos-embedded-anomaly-src-browserwindow-h.html +%%DOCSDIR%%/html/demos-embedded-anomaly-src-controlstrip-cpp.html +%%DOCSDIR%%/html/demos-embedded-anomaly-src-controlstrip-h.html +%%DOCSDIR%%/html/demos-embedded-anomaly-src-flickcharm-cpp.html +%%DOCSDIR%%/html/demos-embedded-anomaly-src-flickcharm-h.html +%%DOCSDIR%%/html/demos-embedded-anomaly-src-homeview-cpp.html +%%DOCSDIR%%/html/demos-embedded-anomaly-src-homeview-h.html +%%DOCSDIR%%/html/demos-embedded-anomaly-src-main-cpp.html +%%DOCSDIR%%/html/demos-embedded-anomaly-src-titlebar-cpp.html +%%DOCSDIR%%/html/demos-embedded-anomaly-src-titlebar-h.html +%%DOCSDIR%%/html/demos-embedded-anomaly-src-zoomstrip-cpp.html +%%DOCSDIR%%/html/demos-embedded-anomaly-src-zoomstrip-h.html +%%DOCSDIR%%/html/demos-embedded-anomaly.html +%%DOCSDIR%%/html/demos-embedded-desktopservices-contenttab-cpp.html +%%DOCSDIR%%/html/demos-embedded-desktopservices-contenttab-h.html +%%DOCSDIR%%/html/demos-embedded-desktopservices-desktopservices-pro.html +%%DOCSDIR%%/html/demos-embedded-desktopservices-desktopservices-qrc.html +%%DOCSDIR%%/html/demos-embedded-desktopservices-desktopwidget-cpp.html +%%DOCSDIR%%/html/demos-embedded-desktopservices-desktopwidget-h.html +%%DOCSDIR%%/html/demos-embedded-desktopservices-linktab-cpp.html +%%DOCSDIR%%/html/demos-embedded-desktopservices-linktab-h.html +%%DOCSDIR%%/html/demos-embedded-desktopservices-main-cpp.html +%%DOCSDIR%%/html/demos-embedded-desktopservices-resources-heart-svg.html +%%DOCSDIR%%/html/demos-embedded-desktopservices.html +%%DOCSDIR%%/html/demos-embedded-digiflip-digiflip-cpp.html +%%DOCSDIR%%/html/demos-embedded-digiflip-digiflip-pro.html +%%DOCSDIR%%/html/demos-embedded-digiflip.html +%%DOCSDIR%%/html/demos-embedded-embeddedsvgviewer-embeddedsvgviewer-cpp.html +%%DOCSDIR%%/html/demos-embedded-embeddedsvgviewer-embeddedsvgviewer-h.html +%%DOCSDIR%%/html/demos-embedded-embeddedsvgviewer-embeddedsvgviewer-pro.html +%%DOCSDIR%%/html/demos-embedded-embeddedsvgviewer-embeddedsvgviewer-qrc.html +%%DOCSDIR%%/html/demos-embedded-embeddedsvgviewer-files-default-svg.html +%%DOCSDIR%%/html/demos-embedded-embeddedsvgviewer-files-v-slider-handle-svg.html +%%DOCSDIR%%/html/demos-embedded-embeddedsvgviewer-main-cpp.html +%%DOCSDIR%%/html/demos-embedded-embeddedsvgviewer-shapes-svg.html +%%DOCSDIR%%/html/demos-embedded-embeddedsvgviewer-spheres-svg.html +%%DOCSDIR%%/html/demos-embedded-embeddedsvgviewer.html +%%DOCSDIR%%/html/demos-embedded-flickable-flickable-cpp.html +%%DOCSDIR%%/html/demos-embedded-flickable-flickable-h.html +%%DOCSDIR%%/html/demos-embedded-flickable-flickable-pro.html +%%DOCSDIR%%/html/demos-embedded-flickable-main-cpp.html +%%DOCSDIR%%/html/demos-embedded-flickable.html +%%DOCSDIR%%/html/demos-embedded-flightinfo-flightinfo-cpp.html +%%DOCSDIR%%/html/demos-embedded-flightinfo-flightinfo-pro.html +%%DOCSDIR%%/html/demos-embedded-flightinfo-flightinfo-qrc.html +%%DOCSDIR%%/html/demos-embedded-flightinfo-form-ui.html +%%DOCSDIR%%/html/demos-embedded-flightinfo.html +%%DOCSDIR%%/html/demos-embedded-fluidlauncher-config-s60-config-xml.html +%%DOCSDIR%%/html/demos-embedded-fluidlauncher-config-wince-config-xml.html +%%DOCSDIR%%/html/demos-embedded-fluidlauncher-config-xml.html +%%DOCSDIR%%/html/demos-embedded-fluidlauncher-demoapplication-cpp.html +%%DOCSDIR%%/html/demos-embedded-fluidlauncher-demoapplication-h.html +%%DOCSDIR%%/html/demos-embedded-fluidlauncher-fluidlauncher-cpp.html +%%DOCSDIR%%/html/demos-embedded-fluidlauncher-fluidlauncher-h.html +%%DOCSDIR%%/html/demos-embedded-fluidlauncher-fluidlauncher-pro.html +%%DOCSDIR%%/html/demos-embedded-fluidlauncher-main-cpp.html +%%DOCSDIR%%/html/demos-embedded-fluidlauncher-pictureflow-cpp.html +%%DOCSDIR%%/html/demos-embedded-fluidlauncher-pictureflow-h.html +%%DOCSDIR%%/html/demos-embedded-fluidlauncher-slideshow-cpp.html +%%DOCSDIR%%/html/demos-embedded-fluidlauncher-slideshow-h.html +%%DOCSDIR%%/html/demos-embedded-fluidlauncher.html +%%DOCSDIR%%/html/demos-embedded-lightmaps-lightmaps-cpp.html +%%DOCSDIR%%/html/demos-embedded-lightmaps-lightmaps-pro.html +%%DOCSDIR%%/html/demos-embedded-lightmaps.html +%%DOCSDIR%%/html/demos-embedded-raycasting-raycasting-cpp.html +%%DOCSDIR%%/html/demos-embedded-raycasting-raycasting-pro.html +%%DOCSDIR%%/html/demos-embedded-raycasting-raycasting-qrc.html +%%DOCSDIR%%/html/demos-embedded-raycasting.html +%%DOCSDIR%%/html/demos-embedded-styledemo-main-cpp.html +%%DOCSDIR%%/html/demos-embedded-styledemo-styledemo-pro.html +%%DOCSDIR%%/html/demos-embedded-styledemo-styledemo-qrc.html +%%DOCSDIR%%/html/demos-embedded-styledemo-stylewidget-cpp.html +%%DOCSDIR%%/html/demos-embedded-styledemo-stylewidget-h.html +%%DOCSDIR%%/html/demos-embedded-styledemo-stylewidget-ui.html +%%DOCSDIR%%/html/demos-embedded-styledemo.html +%%DOCSDIR%%/html/demos-embedded-weatherinfo-icons-weather-few-clouds-svg.html +%%DOCSDIR%%/html/demos-embedded-weatherinfo-icons-weather-fog-svg.html +%%DOCSDIR%%/html/demos-embedded-weatherinfo-icons-weather-haze-svg.html +%%DOCSDIR%%/html/demos-embedded-weatherinfo-icons-weather-icy-svg.html +%%DOCSDIR%%/html/demos-embedded-weatherinfo-icons-weather-overcast-svg.html +%%DOCSDIR%%/html/demos-embedded-weatherinfo-icons-weather-showers-svg.html +%%DOCSDIR%%/html/demos-embedded-weatherinfo-icons-weather-sleet-svg.html +%%DOCSDIR%%/html/demos-embedded-weatherinfo-icons-weather-snow-svg.html +%%DOCSDIR%%/html/demos-embedded-weatherinfo-icons-weather-storm-svg.html +%%DOCSDIR%%/html/demos-embedded-weatherinfo-icons-weather-sunny-svg.html +%%DOCSDIR%%/html/demos-embedded-weatherinfo-icons-weather-sunny-very-few-clouds-svg.html +%%DOCSDIR%%/html/demos-embedded-weatherinfo-icons-weather-thundershower-svg.html +%%DOCSDIR%%/html/demos-embedded-weatherinfo-weatherinfo-cpp.html +%%DOCSDIR%%/html/demos-embedded-weatherinfo-weatherinfo-pro.html +%%DOCSDIR%%/html/demos-embedded-weatherinfo-weatherinfo-qrc.html +%%DOCSDIR%%/html/demos-embedded-weatherinfo.html %%DOCSDIR%%/html/demos-embeddeddialogs-customproxy-cpp.html %%DOCSDIR%%/html/demos-embeddeddialogs-customproxy-h.html %%DOCSDIR%%/html/demos-embeddeddialogs-embeddeddialog-cpp.html @@ -171,6 +359,9 @@ %%DOCSDIR%%/html/demos-gradients-gradients-qrc.html %%DOCSDIR%%/html/demos-gradients-main-cpp.html %%DOCSDIR%%/html/demos-gradients.html +%%DOCSDIR%%/html/demos-interview-images-folder-png.html +%%DOCSDIR%%/html/demos-interview-images-interview-png.html +%%DOCSDIR%%/html/demos-interview-images-services-png.html %%DOCSDIR%%/html/demos-interview-interview-pro.html %%DOCSDIR%%/html/demos-interview-interview-qrc.html %%DOCSDIR%%/html/demos-interview-main-cpp.html @@ -191,19 +382,21 @@ %%DOCSDIR%%/html/demos-mainwindow-toolbar-cpp.html %%DOCSDIR%%/html/demos-mainwindow-toolbar-h.html %%DOCSDIR%%/html/demos-mainwindow.html -%%DOCSDIR%%/html/demos-mediaplayer-main-cpp.html -%%DOCSDIR%%/html/demos-mediaplayer-mediaplayer-cpp.html -%%DOCSDIR%%/html/demos-mediaplayer-mediaplayer-h.html -%%DOCSDIR%%/html/demos-mediaplayer-mediaplayer-pro.html -%%DOCSDIR%%/html/demos-mediaplayer-mediaplayer-qrc.html -%%DOCSDIR%%/html/demos-mediaplayer-settings-ui.html -%%DOCSDIR%%/html/demos-mediaplayer.html %%DOCSDIR%%/html/demos-pathstroke-main-cpp.html %%DOCSDIR%%/html/demos-pathstroke-pathstroke-cpp.html %%DOCSDIR%%/html/demos-pathstroke-pathstroke-h.html %%DOCSDIR%%/html/demos-pathstroke-pathstroke-pro.html %%DOCSDIR%%/html/demos-pathstroke-pathstroke-qrc.html %%DOCSDIR%%/html/demos-pathstroke.html +%%DOCSDIR%%/html/demos-qmediaplayer-images-screen-png.html +%%DOCSDIR%%/html/demos-qmediaplayer-main-cpp.html +%%DOCSDIR%%/html/demos-qmediaplayer-mediaplayer-cpp.html +%%DOCSDIR%%/html/demos-qmediaplayer-mediaplayer-h.html +%%DOCSDIR%%/html/demos-qmediaplayer-mediaplayer-qrc.html +%%DOCSDIR%%/html/demos-qmediaplayer-qmediaplayer-pro.html +%%DOCSDIR%%/html/demos-qmediaplayer-settings-ui.html +%%DOCSDIR%%/html/demos-qmediaplayer.html +%%DOCSDIR%%/html/demos-spreadsheet-images-interview-png.html %%DOCSDIR%%/html/demos-spreadsheet-main-cpp.html %%DOCSDIR%%/html/demos-spreadsheet-printview-cpp.html %%DOCSDIR%%/html/demos-spreadsheet-printview-h.html @@ -227,6 +420,87 @@ %%DOCSDIR%%/html/demos-sqlbrowser-qsqlconnectiondialog-ui.html %%DOCSDIR%%/html/demos-sqlbrowser-sqlbrowser-pro.html %%DOCSDIR%%/html/demos-sqlbrowser.html +%%DOCSDIR%%/html/demos-sub-attaq-animationmanager-cpp.html +%%DOCSDIR%%/html/demos-sub-attaq-animationmanager-h.html +%%DOCSDIR%%/html/demos-sub-attaq-boat-cpp.html +%%DOCSDIR%%/html/demos-sub-attaq-boat-h.html +%%DOCSDIR%%/html/demos-sub-attaq-boat-p-h.html +%%DOCSDIR%%/html/demos-sub-attaq-bomb-cpp.html +%%DOCSDIR%%/html/demos-sub-attaq-bomb-h.html +%%DOCSDIR%%/html/demos-sub-attaq-data-xml.html +%%DOCSDIR%%/html/demos-sub-attaq-graphicsscene-cpp.html +%%DOCSDIR%%/html/demos-sub-attaq-graphicsscene-h.html +%%DOCSDIR%%/html/demos-sub-attaq-main-cpp.html +%%DOCSDIR%%/html/demos-sub-attaq-mainwindow-cpp.html +%%DOCSDIR%%/html/demos-sub-attaq-mainwindow-h.html +%%DOCSDIR%%/html/demos-sub-attaq-pics-scalable-background-n810-svg.html +%%DOCSDIR%%/html/demos-sub-attaq-pics-scalable-background-svg.html +%%DOCSDIR%%/html/demos-sub-attaq-pics-scalable-boat-svg.html +%%DOCSDIR%%/html/demos-sub-attaq-pics-scalable-bomb-svg.html +%%DOCSDIR%%/html/demos-sub-attaq-pics-scalable-sand-svg.html +%%DOCSDIR%%/html/demos-sub-attaq-pics-scalable-see-svg.html +%%DOCSDIR%%/html/demos-sub-attaq-pics-scalable-sky-svg.html +%%DOCSDIR%%/html/demos-sub-attaq-pics-scalable-sub-attaq-svg.html +%%DOCSDIR%%/html/demos-sub-attaq-pics-scalable-submarine-svg.html +%%DOCSDIR%%/html/demos-sub-attaq-pics-scalable-surface-svg.html +%%DOCSDIR%%/html/demos-sub-attaq-pics-scalable-torpedo-svg.html +%%DOCSDIR%%/html/demos-sub-attaq-pixmapitem-cpp.html +%%DOCSDIR%%/html/demos-sub-attaq-pixmapitem-h.html +%%DOCSDIR%%/html/demos-sub-attaq-progressitem-cpp.html +%%DOCSDIR%%/html/demos-sub-attaq-progressitem-h.html +%%DOCSDIR%%/html/demos-sub-attaq-qanimationstate-cpp.html +%%DOCSDIR%%/html/demos-sub-attaq-qanimationstate-h.html +%%DOCSDIR%%/html/demos-sub-attaq-states-cpp.html +%%DOCSDIR%%/html/demos-sub-attaq-states-h.html +%%DOCSDIR%%/html/demos-sub-attaq-sub-attaq-pro.html +%%DOCSDIR%%/html/demos-sub-attaq-subattaq-qrc.html +%%DOCSDIR%%/html/demos-sub-attaq-submarine-cpp.html +%%DOCSDIR%%/html/demos-sub-attaq-submarine-h.html +%%DOCSDIR%%/html/demos-sub-attaq-submarine-p-h.html +%%DOCSDIR%%/html/demos-sub-attaq-textinformationitem-cpp.html +%%DOCSDIR%%/html/demos-sub-attaq-textinformationitem-h.html +%%DOCSDIR%%/html/demos-sub-attaq-torpedo-cpp.html +%%DOCSDIR%%/html/demos-sub-attaq-torpedo-h.html +%%DOCSDIR%%/html/demos-sub-attaq.html +%%DOCSDIR%%/html/demos-textedit-images-logo32-png.html +%%DOCSDIR%%/html/demos-textedit-images-mac-editcopy-png.html +%%DOCSDIR%%/html/demos-textedit-images-mac-editcut-png.html +%%DOCSDIR%%/html/demos-textedit-images-mac-editpaste-png.html +%%DOCSDIR%%/html/demos-textedit-images-mac-editredo-png.html +%%DOCSDIR%%/html/demos-textedit-images-mac-editundo-png.html +%%DOCSDIR%%/html/demos-textedit-images-mac-exportpdf-png.html +%%DOCSDIR%%/html/demos-textedit-images-mac-filenew-png.html +%%DOCSDIR%%/html/demos-textedit-images-mac-fileopen-png.html +%%DOCSDIR%%/html/demos-textedit-images-mac-fileprint-png.html +%%DOCSDIR%%/html/demos-textedit-images-mac-filesave-png.html +%%DOCSDIR%%/html/demos-textedit-images-mac-textbold-png.html +%%DOCSDIR%%/html/demos-textedit-images-mac-textcenter-png.html +%%DOCSDIR%%/html/demos-textedit-images-mac-textitalic-png.html +%%DOCSDIR%%/html/demos-textedit-images-mac-textjustify-png.html +%%DOCSDIR%%/html/demos-textedit-images-mac-textleft-png.html +%%DOCSDIR%%/html/demos-textedit-images-mac-textright-png.html +%%DOCSDIR%%/html/demos-textedit-images-mac-textunder-png.html +%%DOCSDIR%%/html/demos-textedit-images-mac-zoomin-png.html +%%DOCSDIR%%/html/demos-textedit-images-mac-zoomout-png.html +%%DOCSDIR%%/html/demos-textedit-images-win-editcopy-png.html +%%DOCSDIR%%/html/demos-textedit-images-win-editcut-png.html +%%DOCSDIR%%/html/demos-textedit-images-win-editpaste-png.html +%%DOCSDIR%%/html/demos-textedit-images-win-editredo-png.html +%%DOCSDIR%%/html/demos-textedit-images-win-editundo-png.html +%%DOCSDIR%%/html/demos-textedit-images-win-exportpdf-png.html +%%DOCSDIR%%/html/demos-textedit-images-win-filenew-png.html +%%DOCSDIR%%/html/demos-textedit-images-win-fileopen-png.html +%%DOCSDIR%%/html/demos-textedit-images-win-fileprint-png.html +%%DOCSDIR%%/html/demos-textedit-images-win-filesave-png.html +%%DOCSDIR%%/html/demos-textedit-images-win-textbold-png.html +%%DOCSDIR%%/html/demos-textedit-images-win-textcenter-png.html +%%DOCSDIR%%/html/demos-textedit-images-win-textitalic-png.html +%%DOCSDIR%%/html/demos-textedit-images-win-textjustify-png.html +%%DOCSDIR%%/html/demos-textedit-images-win-textleft-png.html +%%DOCSDIR%%/html/demos-textedit-images-win-textright-png.html +%%DOCSDIR%%/html/demos-textedit-images-win-textunder-png.html +%%DOCSDIR%%/html/demos-textedit-images-win-zoomin-png.html +%%DOCSDIR%%/html/demos-textedit-images-win-zoomout-png.html %%DOCSDIR%%/html/demos-textedit-main-cpp.html %%DOCSDIR%%/html/demos-textedit-textedit-cpp.html %%DOCSDIR%%/html/demos-textedit-textedit-h.html @@ -246,6 +520,8 @@ %%DOCSDIR%%/html/demos-undo.html %%DOCSDIR%%/html/demos.html %%DOCSDIR%%/html/deployment-mac.html +%%DOCSDIR%%/html/deployment-plugins.html +%%DOCSDIR%%/html/deployment-symbian.html %%DOCSDIR%%/html/deployment-windows.html %%DOCSDIR%%/html/deployment-x11.html %%DOCSDIR%%/html/deployment.html @@ -308,7 +584,6 @@ %%DOCSDIR%%/html/designer-using-a-ui-file.html %%DOCSDIR%%/html/designer-using-containers.html %%DOCSDIR%%/html/designer-using-custom-widgets.html -%%DOCSDIR%%/html/designer-whats-new.html %%DOCSDIR%%/html/designer-widget-mode.html %%DOCSDIR%%/html/designer-worldtimeclockbuilder-form-ui.html %%DOCSDIR%%/html/designer-worldtimeclockbuilder-main-cpp.html @@ -339,16 +614,28 @@ %%DOCSDIR%%/html/desktop-systray.html %%DOCSDIR%%/html/desktop.html %%DOCSDIR%%/html/developing-on-mac.html +%%DOCSDIR%%/html/developing-with-qt.html +%%DOCSDIR%%/html/dialog-classes.html %%DOCSDIR%%/html/dialogs-classwizard-classwizard-cpp.html %%DOCSDIR%%/html/dialogs-classwizard-classwizard-h.html %%DOCSDIR%%/html/dialogs-classwizard-classwizard-pro.html %%DOCSDIR%%/html/dialogs-classwizard-classwizard-qrc.html +%%DOCSDIR%%/html/dialogs-classwizard-images-background-png.html +%%DOCSDIR%%/html/dialogs-classwizard-images-banner-png.html +%%DOCSDIR%%/html/dialogs-classwizard-images-logo1-png.html +%%DOCSDIR%%/html/dialogs-classwizard-images-logo2-png.html +%%DOCSDIR%%/html/dialogs-classwizard-images-logo3-png.html +%%DOCSDIR%%/html/dialogs-classwizard-images-watermark1-png.html +%%DOCSDIR%%/html/dialogs-classwizard-images-watermark2-png.html %%DOCSDIR%%/html/dialogs-classwizard-main-cpp.html %%DOCSDIR%%/html/dialogs-classwizard.html %%DOCSDIR%%/html/dialogs-configdialog-configdialog-cpp.html %%DOCSDIR%%/html/dialogs-configdialog-configdialog-h.html %%DOCSDIR%%/html/dialogs-configdialog-configdialog-pro.html %%DOCSDIR%%/html/dialogs-configdialog-configdialog-qrc.html +%%DOCSDIR%%/html/dialogs-configdialog-images-config-png.html +%%DOCSDIR%%/html/dialogs-configdialog-images-query-png.html +%%DOCSDIR%%/html/dialogs-configdialog-images-update-png.html %%DOCSDIR%%/html/dialogs-configdialog-main-cpp.html %%DOCSDIR%%/html/dialogs-configdialog-pages-cpp.html %%DOCSDIR%%/html/dialogs-configdialog-pages-h.html @@ -363,6 +650,8 @@ %%DOCSDIR%%/html/dialogs-findfiles-window-cpp.html %%DOCSDIR%%/html/dialogs-findfiles-window-h.html %%DOCSDIR%%/html/dialogs-findfiles.html +%%DOCSDIR%%/html/dialogs-licensewizard-images-logo-png.html +%%DOCSDIR%%/html/dialogs-licensewizard-images-watermark-png.html %%DOCSDIR%%/html/dialogs-licensewizard-licensewizard-cpp.html %%DOCSDIR%%/html/dialogs-licensewizard-licensewizard-h.html %%DOCSDIR%%/html/dialogs-licensewizard-licensewizard-pro.html @@ -391,6 +680,7 @@ %%DOCSDIR%%/html/dnd.html %%DOCSDIR%%/html/draganddrop-delayedencoding-delayedencoding-pro.html %%DOCSDIR%%/html/draganddrop-delayedencoding-delayedencoding-qrc.html +%%DOCSDIR%%/html/draganddrop-delayedencoding-images-drag-png.html %%DOCSDIR%%/html/draganddrop-delayedencoding-images-example-svg.html %%DOCSDIR%%/html/draganddrop-delayedencoding-main-cpp.html %%DOCSDIR%%/html/draganddrop-delayedencoding-mimedata-cpp.html @@ -402,6 +692,9 @@ %%DOCSDIR%%/html/draganddrop-draggableicons-draggableicons-qrc.html %%DOCSDIR%%/html/draganddrop-draggableicons-dragwidget-cpp.html %%DOCSDIR%%/html/draganddrop-draggableicons-dragwidget-h.html +%%DOCSDIR%%/html/draganddrop-draggableicons-images-boat-png.html +%%DOCSDIR%%/html/draganddrop-draggableicons-images-car-png.html +%%DOCSDIR%%/html/draganddrop-draggableicons-images-house-png.html %%DOCSDIR%%/html/draganddrop-draggableicons-main-cpp.html %%DOCSDIR%%/html/draganddrop-draggableicons.html %%DOCSDIR%%/html/draganddrop-draggabletext-draggabletext-pro.html @@ -440,15 +733,74 @@ %%DOCSDIR%%/html/draganddrop.html %%DOCSDIR%%/html/ecmascript.html %%DOCSDIR%%/html/editions.html -%%DOCSDIR%%/html/environment.html +%%DOCSDIR%%/html/effects-blurpicker-blureffect-cpp.html +%%DOCSDIR%%/html/effects-blurpicker-blureffect-h.html +%%DOCSDIR%%/html/effects-blurpicker-blurpicker-cpp.html +%%DOCSDIR%%/html/effects-blurpicker-blurpicker-h.html +%%DOCSDIR%%/html/effects-blurpicker-blurpicker-pro.html +%%DOCSDIR%%/html/effects-blurpicker-blurpicker-qrc.html +%%DOCSDIR%%/html/effects-blurpicker-images-accessories-calculator-png.html +%%DOCSDIR%%/html/effects-blurpicker-images-accessories-text-editor-png.html +%%DOCSDIR%%/html/effects-blurpicker-images-help-browser-png.html +%%DOCSDIR%%/html/effects-blurpicker-images-internet-group-chat-png.html +%%DOCSDIR%%/html/effects-blurpicker-images-internet-mail-png.html +%%DOCSDIR%%/html/effects-blurpicker-images-internet-web-browser-png.html +%%DOCSDIR%%/html/effects-blurpicker-images-office-calendar-png.html +%%DOCSDIR%%/html/effects-blurpicker-images-system-users-png.html +%%DOCSDIR%%/html/effects-blurpicker-main-cpp.html +%%DOCSDIR%%/html/effects-blurpicker.html +%%DOCSDIR%%/html/effects-fademessage-fademessage-cpp.html +%%DOCSDIR%%/html/effects-fademessage-fademessage-h.html +%%DOCSDIR%%/html/effects-fademessage-fademessage-pro.html +%%DOCSDIR%%/html/effects-fademessage-fademessage-qrc.html +%%DOCSDIR%%/html/effects-fademessage-main-cpp.html +%%DOCSDIR%%/html/effects-fademessage.html +%%DOCSDIR%%/html/effects-lighting-lighting-cpp.html +%%DOCSDIR%%/html/effects-lighting-lighting-h.html +%%DOCSDIR%%/html/effects-lighting-lighting-pro.html +%%DOCSDIR%%/html/effects-lighting-main-cpp.html +%%DOCSDIR%%/html/effects-lighting.html %%DOCSDIR%%/html/events.html %%DOCSDIR%%/html/eventsandfilters.html +%%DOCSDIR%%/html/examples-activeqt.html +%%DOCSDIR%%/html/examples-animation.html +%%DOCSDIR%%/html/examples-dbus.html +%%DOCSDIR%%/html/examples-designer.html +%%DOCSDIR%%/html/examples-desktop.html +%%DOCSDIR%%/html/examples-dialogs.html +%%DOCSDIR%%/html/examples-draganddrop.html +%%DOCSDIR%%/html/examples-embeddedlinux.html +%%DOCSDIR%%/html/examples-gestures.html +%%DOCSDIR%%/html/examples-graphicsview.html +%%DOCSDIR%%/html/examples-helpsystem.html +%%DOCSDIR%%/html/examples-ipc.html +%%DOCSDIR%%/html/examples-itemviews.html +%%DOCSDIR%%/html/examples-layouts.html +%%DOCSDIR%%/html/examples-linguist.html +%%DOCSDIR%%/html/examples-mainwindow.html +%%DOCSDIR%%/html/examples-multimedia.html +%%DOCSDIR%%/html/examples-multitouch.html +%%DOCSDIR%%/html/examples-network.html +%%DOCSDIR%%/html/examples-opengl.html +%%DOCSDIR%%/html/examples-openvg.html %%DOCSDIR%%/html/examples-overview.html +%%DOCSDIR%%/html/examples-painting.html +%%DOCSDIR%%/html/examples-richtext.html +%%DOCSDIR%%/html/examples-script.html +%%DOCSDIR%%/html/examples-sql.html +%%DOCSDIR%%/html/examples-statemachine.html +%%DOCSDIR%%/html/examples-threadandconcurrent.html +%%DOCSDIR%%/html/examples-tools.html +%%DOCSDIR%%/html/examples-uitools.html +%%DOCSDIR%%/html/examples-webkit.html +%%DOCSDIR%%/html/examples-widgets.html +%%DOCSDIR%%/html/examples-xml.html %%DOCSDIR%%/html/examples.html -%%DOCSDIR%%/html/explicitly-shared.html +%%DOCSDIR%%/html/exceptionsafety.html %%DOCSDIR%%/html/exportedfunctions.html %%DOCSDIR%%/html/fine-tuning-features.html %%DOCSDIR%%/html/focus.html +%%DOCSDIR%%/html/frameworks-technologies.html %%DOCSDIR%%/html/full-framework-edition-classes.html %%DOCSDIR%%/html/functions.html %%DOCSDIR%%/html/gallery-cde.html @@ -462,11 +814,19 @@ %%DOCSDIR%%/html/gallery-windowsxp.html %%DOCSDIR%%/html/gallery.html %%DOCSDIR%%/html/geomanagement.html -%%DOCSDIR%%/html/geometry.html +%%DOCSDIR%%/html/gestures-imagegestures-imagegestures-pro.html +%%DOCSDIR%%/html/gestures-imagegestures-imagewidget-cpp.html +%%DOCSDIR%%/html/gestures-imagegestures-imagewidget-h.html +%%DOCSDIR%%/html/gestures-imagegestures-main-cpp.html +%%DOCSDIR%%/html/gestures-imagegestures-mainwidget-cpp.html +%%DOCSDIR%%/html/gestures-imagegestures-mainwidget-h.html +%%DOCSDIR%%/html/gestures-imagegestures.html +%%DOCSDIR%%/html/gestures-overview.html %%DOCSDIR%%/html/gpl.html %%DOCSDIR%%/html/graphicsview-api.html %%DOCSDIR%%/html/graphicsview-basicgraphicslayouts-basicgraphicslayouts-pro.html %%DOCSDIR%%/html/graphicsview-basicgraphicslayouts-basicgraphicslayouts-qrc.html +%%DOCSDIR%%/html/graphicsview-basicgraphicslayouts-images-block-png.html %%DOCSDIR%%/html/graphicsview-basicgraphicslayouts-layoutitem-cpp.html %%DOCSDIR%%/html/graphicsview-basicgraphicslayouts-layoutitem-h.html %%DOCSDIR%%/html/graphicsview-basicgraphicslayouts-main-cpp.html @@ -489,6 +849,21 @@ %%DOCSDIR%%/html/graphicsview-diagramscene-diagramscene-qrc.html %%DOCSDIR%%/html/graphicsview-diagramscene-diagramtextitem-cpp.html %%DOCSDIR%%/html/graphicsview-diagramscene-diagramtextitem-h.html +%%DOCSDIR%%/html/graphicsview-diagramscene-images-background1-png.html +%%DOCSDIR%%/html/graphicsview-diagramscene-images-background2-png.html +%%DOCSDIR%%/html/graphicsview-diagramscene-images-background3-png.html +%%DOCSDIR%%/html/graphicsview-diagramscene-images-background4-png.html +%%DOCSDIR%%/html/graphicsview-diagramscene-images-bold-png.html +%%DOCSDIR%%/html/graphicsview-diagramscene-images-bringtofront-png.html +%%DOCSDIR%%/html/graphicsview-diagramscene-images-delete-png.html +%%DOCSDIR%%/html/graphicsview-diagramscene-images-floodfill-png.html +%%DOCSDIR%%/html/graphicsview-diagramscene-images-italic-png.html +%%DOCSDIR%%/html/graphicsview-diagramscene-images-linecolor-png.html +%%DOCSDIR%%/html/graphicsview-diagramscene-images-linepointer-png.html +%%DOCSDIR%%/html/graphicsview-diagramscene-images-pointer-png.html +%%DOCSDIR%%/html/graphicsview-diagramscene-images-sendtoback-png.html +%%DOCSDIR%%/html/graphicsview-diagramscene-images-textpointer-png.html +%%DOCSDIR%%/html/graphicsview-diagramscene-images-underline-png.html %%DOCSDIR%%/html/graphicsview-diagramscene-main-cpp.html %%DOCSDIR%%/html/graphicsview-diagramscene-mainwindow-cpp.html %%DOCSDIR%%/html/graphicsview-diagramscene-mainwindow-h.html @@ -496,6 +871,7 @@ %%DOCSDIR%%/html/graphicsview-dragdroprobot-coloritem-cpp.html %%DOCSDIR%%/html/graphicsview-dragdroprobot-coloritem-h.html %%DOCSDIR%%/html/graphicsview-dragdroprobot-dragdroprobot-pro.html +%%DOCSDIR%%/html/graphicsview-dragdroprobot-images-head-png.html %%DOCSDIR%%/html/graphicsview-dragdroprobot-main-cpp.html %%DOCSDIR%%/html/graphicsview-dragdroprobot-robot-cpp.html %%DOCSDIR%%/html/graphicsview-dragdroprobot-robot-h.html @@ -511,6 +887,14 @@ %%DOCSDIR%%/html/graphicsview-elasticnodes-node-h.html %%DOCSDIR%%/html/graphicsview-elasticnodes.html %%DOCSDIR%%/html/graphicsview-padnavigator-backside-ui.html +%%DOCSDIR%%/html/graphicsview-padnavigator-images-artsfftscope-png.html +%%DOCSDIR%%/html/graphicsview-padnavigator-images-kontact-contacts-png.html +%%DOCSDIR%%/html/graphicsview-padnavigator-images-kontact-journal-png.html +%%DOCSDIR%%/html/graphicsview-padnavigator-images-kontact-mail-png.html +%%DOCSDIR%%/html/graphicsview-padnavigator-images-kontact-notes-png.html +%%DOCSDIR%%/html/graphicsview-padnavigator-images-kopeteavailable-png.html +%%DOCSDIR%%/html/graphicsview-padnavigator-images-metacontact-online-png.html +%%DOCSDIR%%/html/graphicsview-padnavigator-images-minitools-png.html %%DOCSDIR%%/html/graphicsview-padnavigator-main-cpp.html %%DOCSDIR%%/html/graphicsview-padnavigator-padnavigator-pro.html %%DOCSDIR%%/html/graphicsview-padnavigator-padnavigator-qrc.html @@ -546,7 +930,6 @@ %%DOCSDIR%%/html/graphicsview.html %%DOCSDIR%%/html/groups.html %%DOCSDIR%%/html/gui-framework-edition-classes.html -%%DOCSDIR%%/html/gui-programming.html %%DOCSDIR%%/html/guibooks.html %%DOCSDIR%%/html/help-remotecontrol-main-cpp.html %%DOCSDIR%%/html/help-remotecontrol-remotecontrol-cpp.html @@ -571,12 +954,15 @@ %%DOCSDIR%%/html/helpsystem.html %%DOCSDIR%%/html/hierarchy.html %%DOCSDIR%%/html/how-to-learn-qt.html -%%DOCSDIR%%/html/howto.html +%%DOCSDIR%%/html/hwacc-rendering.html +%%DOCSDIR%%/html/i18n-plural-rules.html +%%DOCSDIR%%/html/i18n-source-translation.html %%DOCSDIR%%/html/i18n.html %%DOCSDIR%%/html/images/2dpainting-example.png %%DOCSDIR%%/html/images/abstract-connections.png %%DOCSDIR%%/html/images/accessibilityarchitecture.png %%DOCSDIR%%/html/images/accessibleobjecttree.png +%%DOCSDIR%%/html/images/activeqt-examples.png %%DOCSDIR%%/html/images/addressbook-adddialog.png %%DOCSDIR%%/html/images/addressbook-classes.png %%DOCSDIR%%/html/images/addressbook-editdialog.png @@ -613,7 +999,12 @@ %%DOCSDIR%%/html/images/alphafill.png %%DOCSDIR%%/html/images/analogclock-example.png %%DOCSDIR%%/html/images/analogclock-viewport.png +%%DOCSDIR%%/html/images/animatedtiles-example.png +%%DOCSDIR%%/html/images/animation-examples.png +%%DOCSDIR%%/html/images/animations-architecture.png +%%DOCSDIR%%/html/images/anomaly-demo.png %%DOCSDIR%%/html/images/antialiased.png +%%DOCSDIR%%/html/images/appchooser-example.png %%DOCSDIR%%/html/images/application-menus.png %%DOCSDIR%%/html/images/application.png %%DOCSDIR%%/html/images/arthurplugin-demo.png @@ -635,6 +1026,7 @@ %%DOCSDIR%%/html/images/basicsortfiltermodel-example.png %%DOCSDIR%%/html/images/bearings.png %%DOCSDIR%%/html/images/blockingfortuneclient-example.png +%%DOCSDIR%%/html/images/blurpickereffect-example.png %%DOCSDIR%%/html/images/books-demo.png %%DOCSDIR%%/html/images/borderlayout-example.png %%DOCSDIR%%/html/images/boxes-demo.png @@ -693,6 +1085,8 @@ %%DOCSDIR%%/html/images/charactermap-example.png %%DOCSDIR%%/html/images/chart-example.png %%DOCSDIR%%/html/images/checkbox.png +%%DOCSDIR%%/html/images/checkboxes-exclusive.png +%%DOCSDIR%%/html/images/checkboxes-non-exclusive.png %%DOCSDIR%%/html/images/checkboxexample.png %%DOCSDIR%%/html/images/chip-demo.png %%DOCSDIR%%/html/images/classwizard-flow.png @@ -780,6 +1174,7 @@ %%DOCSDIR%%/html/images/customwidgetplugin-example.png %%DOCSDIR%%/html/images/datetimewidgets.png %%DOCSDIR%%/html/images/dbus-chat-example.png +%%DOCSDIR%%/html/images/dbus-examples.png %%DOCSDIR%%/html/images/defaultprototypes-example.png %%DOCSDIR%%/html/images/deform-demo.png %%DOCSDIR%%/html/images/delayedecoding-example.png @@ -819,13 +1214,12 @@ %%DOCSDIR%%/html/images/designer-creating-menu2.png %%DOCSDIR%%/html/images/designer-creating-menu3.png %%DOCSDIR%%/html/images/designer-creating-menu4.png +%%DOCSDIR%%/html/images/designer-creating-toolbar.png %%DOCSDIR%%/html/images/designer-dialog-preview.png -%%DOCSDIR%%/html/images/designer-disambiguation.png %%DOCSDIR%%/html/images/designer-dragging-onto-form.png %%DOCSDIR%%/html/images/designer-edit-resource.png %%DOCSDIR%%/html/images/designer-edit-resources-button.png %%DOCSDIR%%/html/images/designer-editing-mode.png -%%DOCSDIR%%/html/images/designer-embedded-preview.png %%DOCSDIR%%/html/images/designer-english-dialog.png %%DOCSDIR%%/html/images/designer-examples.png %%DOCSDIR%%/html/images/designer-file-menu.png @@ -857,11 +1251,11 @@ %%DOCSDIR%%/html/images/designer-property-editor.png %%DOCSDIR%%/html/images/designer-reload-resources-button.png %%DOCSDIR%%/html/images/designer-remove-resource-entry-button.png +%%DOCSDIR%%/html/images/designer-removing-toolbar-action.png %%DOCSDIR%%/html/images/designer-resource-browser.png %%DOCSDIR%%/html/images/designer-resource-selector.png %%DOCSDIR%%/html/images/designer-resources-editing.png %%DOCSDIR%%/html/images/designer-resources-using.png -%%DOCSDIR%%/html/images/designer-screenshot-small.png %%DOCSDIR%%/html/images/designer-screenshot.png %%DOCSDIR%%/html/images/designer-selecting-widget.png %%DOCSDIR%%/html/images/designer-set-layout.png @@ -873,7 +1267,6 @@ %%DOCSDIR%%/html/images/designer-tab-order-tool.png %%DOCSDIR%%/html/images/designer-validator-highlighter.png %%DOCSDIR%%/html/images/designer-widget-box.png -%%DOCSDIR%%/html/images/designer-widget-filter.png %%DOCSDIR%%/html/images/designer-widget-morph.png %%DOCSDIR%%/html/images/designer-widget-tool.png %%DOCSDIR%%/html/images/desktop-examples.png @@ -895,14 +1288,20 @@ %%DOCSDIR%%/html/images/drilldown-example.png %%DOCSDIR%%/html/images/dropsite-example.png %%DOCSDIR%%/html/images/dynamiclayouts-example.png +%%DOCSDIR%%/html/images/easing-example.png %%DOCSDIR%%/html/images/echopluginexample.png %%DOCSDIR%%/html/images/effectwidget.png %%DOCSDIR%%/html/images/elasticnodes-example.png %%DOCSDIR%%/html/images/embedded-simpledecoration-example-styles.png %%DOCSDIR%%/html/images/embedded-simpledecoration-example.png +%%DOCSDIR%%/html/images/embeddeddesktopservices-demo.png %%DOCSDIR%%/html/images/embeddeddialogs-demo.png +%%DOCSDIR%%/html/images/embeddedsvgviewer-demo.png %%DOCSDIR%%/html/images/extension-example.png %%DOCSDIR%%/html/images/extension_more.png +%%DOCSDIR%%/html/images/factorial-example.png +%%DOCSDIR%%/html/images/fademessageeffect-example-faded.png +%%DOCSDIR%%/html/images/fademessageeffect-example.png %%DOCSDIR%%/html/images/fancybrowser-example.png %%DOCSDIR%%/html/images/fetchmore-example.png %%DOCSDIR%%/html/images/filedialogurls.png @@ -910,7 +1309,10 @@ %%DOCSDIR%%/html/images/filetree_2-example.png %%DOCSDIR%%/html/images/findfiles-example.png %%DOCSDIR%%/html/images/findfiles_progress_dialog.png +%%DOCSDIR%%/html/images/flickable-demo.png +%%DOCSDIR%%/html/images/flightinfo-demo.png %%DOCSDIR%%/html/images/flowlayout-example.png +%%DOCSDIR%%/html/images/fluidlauncher-demo.png %%DOCSDIR%%/html/images/fontsampler-example.png %%DOCSDIR%%/html/images/foreignkeys.png %%DOCSDIR%%/html/images/formextractor-example.png @@ -924,11 +1326,20 @@ %%DOCSDIR%%/html/images/frozencolumn-tableview.png %%DOCSDIR%%/html/images/ftp-example.png %%DOCSDIR%%/html/images/geometry.png +%%DOCSDIR%%/html/images/gestures-examples.png +%%DOCSDIR%%/html/images/gestures.png %%DOCSDIR%%/html/images/googlechat-example.png %%DOCSDIR%%/html/images/googlesuggest-example.png %%DOCSDIR%%/html/images/grabber-example.png +%%DOCSDIR%%/html/images/gradient.png %%DOCSDIR%%/html/images/gradientText.png %%DOCSDIR%%/html/images/gradients-demo.png +%%DOCSDIR%%/html/images/graphicseffect-blur.png +%%DOCSDIR%%/html/images/graphicseffect-colorize.png +%%DOCSDIR%%/html/images/graphicseffect-drop-shadow.png +%%DOCSDIR%%/html/images/graphicseffect-opacity.png +%%DOCSDIR%%/html/images/graphicseffect-plain.png +%%DOCSDIR%%/html/images/graphicseffect-widget.png %%DOCSDIR%%/html/images/graphicsview-ellipseitem-pie.png %%DOCSDIR%%/html/images/graphicsview-ellipseitem.png %%DOCSDIR%%/html/images/graphicsview-examples.png @@ -967,7 +1378,6 @@ %%DOCSDIR%%/html/images/gtk-radiobutton.png %%DOCSDIR%%/html/images/gtk-slider.png %%DOCSDIR%%/html/images/gtk-spinbox.png -%%DOCSDIR%%/html/images/gtk-style-screenshot.png %%DOCSDIR%%/html/images/gtk-tableview.png %%DOCSDIR%%/html/images/gtk-tabwidget.png %%DOCSDIR%%/html/images/gtk-textedit.png @@ -979,6 +1389,7 @@ %%DOCSDIR%%/html/images/headerimage.png %%DOCSDIR%%/html/images/hellogl-es-example.png %%DOCSDIR%%/html/images/hellogl-example.png +%%DOCSDIR%%/html/images/hoverevents.png %%DOCSDIR%%/html/images/http-example.png %%DOCSDIR%%/html/images/httpstack.png %%DOCSDIR%%/html/images/i18n-example.png @@ -1009,9 +1420,11 @@ %%DOCSDIR%%/html/images/imageviewer-zoom_in_1.png %%DOCSDIR%%/html/images/imageviewer-zoom_in_2.png %%DOCSDIR%%/html/images/inputdialogs.png +%%DOCSDIR%%/html/images/inputpanel-example.png %%DOCSDIR%%/html/images/insertrowinmodelview.png %%DOCSDIR%%/html/images/interview-demo.png %%DOCSDIR%%/html/images/interview-shareddirmodel.png +%%DOCSDIR%%/html/images/ipc-examples.png %%DOCSDIR%%/html/images/itemview-examples.png %%DOCSDIR%%/html/images/itemviews-editabletreemodel-indexes.png %%DOCSDIR%%/html/images/itemviews-editabletreemodel-items.png @@ -1026,6 +1439,8 @@ %%DOCSDIR%%/html/images/layout2.png %%DOCSDIR%%/html/images/licensewizard-example.png %%DOCSDIR%%/html/images/licensewizard-flow.png +%%DOCSDIR%%/html/images/lightingeffect-example.png +%%DOCSDIR%%/html/images/lightmaps-demo.png %%DOCSDIR%%/html/images/lineedits-example.png %%DOCSDIR%%/html/images/linguist-arrowpad_en.png %%DOCSDIR%%/html/images/linguist-arrowpad_fr.png @@ -1074,7 +1489,6 @@ %%DOCSDIR%%/html/images/localfortuneclient-example.png %%DOCSDIR%%/html/images/localfortuneserver-example.png %%DOCSDIR%%/html/images/loopback-example.png -%%DOCSDIR%%/html/images/mac-cocoa.png %%DOCSDIR%%/html/images/macintosh-calendarwidget.png %%DOCSDIR%%/html/images/macintosh-checkbox.png %%DOCSDIR%%/html/images/macintosh-combobox.png @@ -1166,12 +1580,17 @@ %%DOCSDIR%%/html/images/motif-toolbox.png %%DOCSDIR%%/html/images/motif-toolbutton.png %%DOCSDIR%%/html/images/motif-treeview.png +%%DOCSDIR%%/html/images/move-blocks-chart.png +%%DOCSDIR%%/html/images/moveblocks-example.png %%DOCSDIR%%/html/images/movie-example.png %%DOCSDIR%%/html/images/msgbox1.png %%DOCSDIR%%/html/images/msgbox2.png %%DOCSDIR%%/html/images/msgbox3.png %%DOCSDIR%%/html/images/msgbox4.png %%DOCSDIR%%/html/images/multipleinheritance-example.png +%%DOCSDIR%%/html/images/multitouch-dials-example.png +%%DOCSDIR%%/html/images/multitouch-examples.png +%%DOCSDIR%%/html/images/multitouch-knobs-example.png %%DOCSDIR%%/html/images/musicplayer.png %%DOCSDIR%%/html/images/network-chat-example.png %%DOCSDIR%%/html/images/network-examples.png @@ -1194,6 +1613,7 @@ %%DOCSDIR%%/html/images/paintsystem-stylepainter.png %%DOCSDIR%%/html/images/paintsystem-svg.png %%DOCSDIR%%/html/images/palette.png +%%DOCSDIR%%/html/images/pangesture.png %%DOCSDIR%%/html/images/parent-child-widgets.png %%DOCSDIR%%/html/images/pathexample.png %%DOCSDIR%%/html/images/pathstroke-demo.png @@ -1201,6 +1621,8 @@ %%DOCSDIR%%/html/images/pbuffers-example.png %%DOCSDIR%%/html/images/pbuffers2-example.png %%DOCSDIR%%/html/images/phonon-examples.png +%%DOCSDIR%%/html/images/pinchgesture.png +%%DOCSDIR%%/html/images/pingpong-example.png %%DOCSDIR%%/html/images/pixelator-example.png %%DOCSDIR%%/html/images/plaintext-layout.png %%DOCSDIR%%/html/images/plastique-calendarwidget.png @@ -1242,6 +1664,7 @@ %%DOCSDIR%%/html/images/plastique-toolbox.png %%DOCSDIR%%/html/images/plastique-toolbutton.png %%DOCSDIR%%/html/images/plastique-treeview.png +%%DOCSDIR%%/html/images/platformHWAcc.png %%DOCSDIR%%/html/images/plugandpaint-plugindialog.png %%DOCSDIR%%/html/images/plugandpaint.png %%DOCSDIR%%/html/images/portedasteroids-example.png @@ -1274,6 +1697,47 @@ %%DOCSDIR%%/html/images/qdatawidgetmapper-simple.png %%DOCSDIR%%/html/images/qdesktopwidget.png %%DOCSDIR%%/html/images/qdockwindow.png +%%DOCSDIR%%/html/images/qeasingcurve-inback.png +%%DOCSDIR%%/html/images/qeasingcurve-inbounce.png +%%DOCSDIR%%/html/images/qeasingcurve-incirc.png +%%DOCSDIR%%/html/images/qeasingcurve-incubic.png +%%DOCSDIR%%/html/images/qeasingcurve-inelastic.png +%%DOCSDIR%%/html/images/qeasingcurve-inexpo.png +%%DOCSDIR%%/html/images/qeasingcurve-inoutback.png +%%DOCSDIR%%/html/images/qeasingcurve-inoutbounce.png +%%DOCSDIR%%/html/images/qeasingcurve-inoutcirc.png +%%DOCSDIR%%/html/images/qeasingcurve-inoutcubic.png +%%DOCSDIR%%/html/images/qeasingcurve-inoutelastic.png +%%DOCSDIR%%/html/images/qeasingcurve-inoutexpo.png +%%DOCSDIR%%/html/images/qeasingcurve-inoutquad.png +%%DOCSDIR%%/html/images/qeasingcurve-inoutquart.png +%%DOCSDIR%%/html/images/qeasingcurve-inoutquint.png +%%DOCSDIR%%/html/images/qeasingcurve-inoutsine.png +%%DOCSDIR%%/html/images/qeasingcurve-inquad.png +%%DOCSDIR%%/html/images/qeasingcurve-inquart.png +%%DOCSDIR%%/html/images/qeasingcurve-inquint.png +%%DOCSDIR%%/html/images/qeasingcurve-insine.png +%%DOCSDIR%%/html/images/qeasingcurve-linear.png +%%DOCSDIR%%/html/images/qeasingcurve-outback.png +%%DOCSDIR%%/html/images/qeasingcurve-outbounce.png +%%DOCSDIR%%/html/images/qeasingcurve-outcirc.png +%%DOCSDIR%%/html/images/qeasingcurve-outcubic.png +%%DOCSDIR%%/html/images/qeasingcurve-outelastic.png +%%DOCSDIR%%/html/images/qeasingcurve-outexpo.png +%%DOCSDIR%%/html/images/qeasingcurve-outinback.png +%%DOCSDIR%%/html/images/qeasingcurve-outinbounce.png +%%DOCSDIR%%/html/images/qeasingcurve-outincirc.png +%%DOCSDIR%%/html/images/qeasingcurve-outincubic.png +%%DOCSDIR%%/html/images/qeasingcurve-outinelastic.png +%%DOCSDIR%%/html/images/qeasingcurve-outinexpo.png +%%DOCSDIR%%/html/images/qeasingcurve-outinquad.png +%%DOCSDIR%%/html/images/qeasingcurve-outinquart.png +%%DOCSDIR%%/html/images/qeasingcurve-outinquint.png +%%DOCSDIR%%/html/images/qeasingcurve-outinsine.png +%%DOCSDIR%%/html/images/qeasingcurve-outquad.png +%%DOCSDIR%%/html/images/qeasingcurve-outquart.png +%%DOCSDIR%%/html/images/qeasingcurve-outquint.png +%%DOCSDIR%%/html/images/qeasingcurve-outsine.png %%DOCSDIR%%/html/images/qerrormessage.png %%DOCSDIR%%/html/images/qformlayout-kde.png %%DOCSDIR%%/html/images/qformlayout-mac.png @@ -1303,6 +1767,7 @@ %%DOCSDIR%%/html/images/qlistbox-m.png %%DOCSDIR%%/html/images/qlistbox-w.png %%DOCSDIR%%/html/images/qlistviewitems.png +%%DOCSDIR%%/html/images/qmacstyle.png %%DOCSDIR%%/html/images/qmainwindow-qdockareas.png %%DOCSDIR%%/html/images/qmatrix-combinedtransformation.png %%DOCSDIR%%/html/images/qmatrix-representation.png @@ -1367,6 +1832,7 @@ %%DOCSDIR%%/html/images/qprogbar-w.png %%DOCSDIR%%/html/images/qprogdlg-m.png %%DOCSDIR%%/html/images/qprogdlg-w.png +%%DOCSDIR%%/html/images/qq-thumbnail.png %%DOCSDIR%%/html/images/qradialgradient-pad.png %%DOCSDIR%%/html/images/qradialgradient-reflect.png %%DOCSDIR%%/html/images/qradialgradient-repeat.png @@ -1410,9 +1876,7 @@ %%DOCSDIR%%/html/images/qt-embedded-drawingonscreen.png %%DOCSDIR%%/html/images/qt-embedded-examples.png %%DOCSDIR%%/html/images/qt-embedded-fontfeatures.png -%%DOCSDIR%%/html/images/qt-embedded-opengl1.png -%%DOCSDIR%%/html/images/qt-embedded-opengl2.png -%%DOCSDIR%%/html/images/qt-embedded-opengl3.png +%%DOCSDIR%%/html/images/qt-embedded-linux-architecture.png %%DOCSDIR%%/html/images/qt-embedded-pda.png %%DOCSDIR%%/html/images/qt-embedded-phone.png %%DOCSDIR%%/html/images/qt-embedded-pointerhandlinglayer.png @@ -1445,7 +1909,6 @@ %%DOCSDIR%%/html/images/qtransform-representation.png %%DOCSDIR%%/html/images/qtransform-simpletransformation.png %%DOCSDIR%%/html/images/qtscript-calculator-example.png -%%DOCSDIR%%/html/images/qtscript-debugger-small.png %%DOCSDIR%%/html/images/qtscript-debugger.png %%DOCSDIR%%/html/images/qtscript-examples.png %%DOCSDIR%%/html/images/qtwizard-aero1.png @@ -1474,7 +1937,9 @@ %%DOCSDIR%%/html/images/qwebview-url.png %%DOCSDIR%%/html/images/qwindowsstyle.png %%DOCSDIR%%/html/images/qwindowsxpstyle.png +%%DOCSDIR%%/html/images/qwsserver_keyboardfilter.png %%DOCSDIR%%/html/images/radialGradient.png +%%DOCSDIR%%/html/images/raycasting-demo.png %%DOCSDIR%%/html/images/recentfiles-example.png %%DOCSDIR%%/html/images/recipes-example.png %%DOCSDIR%%/html/images/regexp-example.png @@ -1495,6 +1960,8 @@ %%DOCSDIR%%/html/images/richtext-document.png %%DOCSDIR%%/html/images/richtext-examples.png %%DOCSDIR%%/html/images/rintersect.png +%%DOCSDIR%%/html/images/rogue-example.png +%%DOCSDIR%%/html/images/rogue-statechart.png %%DOCSDIR%%/html/images/rsslistingexample.png %%DOCSDIR%%/html/images/rsubtract.png %%DOCSDIR%%/html/images/rubberband.png @@ -1503,6 +1970,7 @@ %%DOCSDIR%%/html/images/rxor.png %%DOCSDIR%%/html/images/samplebuffers-example.png %%DOCSDIR%%/html/images/saxbookmarks-example.png +%%DOCSDIR%%/html/images/schema-example.png %%DOCSDIR%%/html/images/screenshot-example.png %%DOCSDIR%%/html/images/scribble-example.png %%DOCSDIR%%/html/images/scrollbar.png @@ -1526,6 +1994,7 @@ %%DOCSDIR%%/html/images/sharedmodel-tableviews.png %%DOCSDIR%%/html/images/sharedselection-tableviews.png %%DOCSDIR%%/html/images/signals-n-slots-aw-nat.png +%%DOCSDIR%%/html/images/simpleanchorlayout-example.png %%DOCSDIR%%/html/images/simpledommodel-example.png %%DOCSDIR%%/html/images/simpletextviewer-example.png %%DOCSDIR%%/html/images/simpletextviewer-findfiledialog.png @@ -1550,8 +2019,23 @@ %%DOCSDIR%%/html/images/standard-views.png %%DOCSDIR%%/html/images/standarddialogs-example.png %%DOCSDIR%%/html/images/stardelegate.png +%%DOCSDIR%%/html/images/statemachine-button-history.png +%%DOCSDIR%%/html/images/statemachine-button-nested.png +%%DOCSDIR%%/html/images/statemachine-button.png +%%DOCSDIR%%/html/images/statemachine-customevents.png +%%DOCSDIR%%/html/images/statemachine-customevents2.png +%%DOCSDIR%%/html/images/statemachine-examples.png +%%DOCSDIR%%/html/images/statemachine-finished.png +%%DOCSDIR%%/html/images/statemachine-nonparallel.png +%%DOCSDIR%%/html/images/statemachine-parallel.png +%%DOCSDIR%%/html/images/states-example.png +%%DOCSDIR%%/html/images/stickman-example.png +%%DOCSDIR%%/html/images/stickman-example1.png +%%DOCSDIR%%/html/images/stickman-example2.png +%%DOCSDIR%%/html/images/stickman-example3.png %%DOCSDIR%%/html/images/stliterators1.png %%DOCSDIR%%/html/images/stringlistmodel.png +%%DOCSDIR%%/html/images/styledemo-demo.png %%DOCSDIR%%/html/images/stylepluginexample.png %%DOCSDIR%%/html/images/styles-3d.png %%DOCSDIR%%/html/images/styles-aliasing.png @@ -1578,9 +2062,11 @@ %%DOCSDIR%%/html/images/stylesheet-scrollbar2.png %%DOCSDIR%%/html/images/stylesheet-treeview.png %%DOCSDIR%%/html/images/stylesheet-vline.png +%%DOCSDIR%%/html/images/sub-attaq-demo.png %%DOCSDIR%%/html/images/svg-image.png %%DOCSDIR%%/html/images/svggenerator-example.png %%DOCSDIR%%/html/images/svgviewer-example.png +%%DOCSDIR%%/html/images/swipegesture.png %%DOCSDIR%%/html/images/syntaxhighlighter-example.png %%DOCSDIR%%/html/images/system-tray.png %%DOCSDIR%%/html/images/systemtray-editor.png @@ -1623,6 +2109,9 @@ %%DOCSDIR%%/html/images/tooltips-example.png %%DOCSDIR%%/html/images/torrent-example.png %%DOCSDIR%%/html/images/trafficinfo-example.png +%%DOCSDIR%%/html/images/trafficlight-example.png +%%DOCSDIR%%/html/images/trafficlight-example1.png +%%DOCSDIR%%/html/images/trafficlight-example2.png %%DOCSDIR%%/html/images/transformations-example.png %%DOCSDIR%%/html/images/treemodel-structure.png %%DOCSDIR%%/html/images/treemodelcompleter-example.png @@ -1635,9 +2124,211 @@ %%DOCSDIR%%/html/images/uitools-examples.png %%DOCSDIR%%/html/images/undodemo.png %%DOCSDIR%%/html/images/undoframeworkexample.png +%%DOCSDIR%%/html/images/used-in-examples/animation/animatedtiles/images/centered.png +%%DOCSDIR%%/html/images/used-in-examples/animation/animatedtiles/images/ellipse.png +%%DOCSDIR%%/html/images/used-in-examples/animation/animatedtiles/images/figure8.png +%%DOCSDIR%%/html/images/used-in-examples/animation/animatedtiles/images/kinetic.png +%%DOCSDIR%%/html/images/used-in-examples/animation/animatedtiles/images/random.png +%%DOCSDIR%%/html/images/used-in-examples/animation/animatedtiles/images/tile.png +%%DOCSDIR%%/html/images/used-in-examples/animation/easing/images/qt-logo.png +%%DOCSDIR%%/html/images/used-in-examples/demos/books/images/star.png +%%DOCSDIR%%/html/images/used-in-examples/demos/interview/images/folder.png +%%DOCSDIR%%/html/images/used-in-examples/demos/interview/images/interview.png +%%DOCSDIR%%/html/images/used-in-examples/demos/interview/images/services.png +%%DOCSDIR%%/html/images/used-in-examples/demos/qmediaplayer/images/screen.png +%%DOCSDIR%%/html/images/used-in-examples/demos/spreadsheet/images/interview.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/logo32.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/mac/editcopy.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/mac/editcut.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/mac/editpaste.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/mac/editredo.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/mac/editundo.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/mac/exportpdf.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/mac/filenew.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/mac/fileopen.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/mac/fileprint.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/mac/filesave.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/mac/textbold.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/mac/textcenter.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/mac/textitalic.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/mac/textjustify.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/mac/textleft.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/mac/textright.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/mac/textunder.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/mac/zoomin.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/mac/zoomout.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/win/editcopy.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/win/editcut.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/win/editpaste.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/win/editredo.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/win/editundo.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/win/exportpdf.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/win/filenew.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/win/fileopen.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/win/fileprint.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/win/filesave.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/win/textbold.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/win/textcenter.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/win/textitalic.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/win/textjustify.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/win/textleft.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/win/textright.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/win/textunder.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/win/zoomin.png +%%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/win/zoomout.png +%%DOCSDIR%%/html/images/used-in-examples/dialogs/classwizard/images/background.png +%%DOCSDIR%%/html/images/used-in-examples/dialogs/classwizard/images/banner.png +%%DOCSDIR%%/html/images/used-in-examples/dialogs/classwizard/images/logo1.png +%%DOCSDIR%%/html/images/used-in-examples/dialogs/classwizard/images/logo2.png +%%DOCSDIR%%/html/images/used-in-examples/dialogs/classwizard/images/logo3.png +%%DOCSDIR%%/html/images/used-in-examples/dialogs/classwizard/images/watermark1.png +%%DOCSDIR%%/html/images/used-in-examples/dialogs/classwizard/images/watermark2.png +%%DOCSDIR%%/html/images/used-in-examples/dialogs/configdialog/images/config.png +%%DOCSDIR%%/html/images/used-in-examples/dialogs/configdialog/images/query.png +%%DOCSDIR%%/html/images/used-in-examples/dialogs/configdialog/images/update.png +%%DOCSDIR%%/html/images/used-in-examples/dialogs/licensewizard/images/logo.png +%%DOCSDIR%%/html/images/used-in-examples/dialogs/licensewizard/images/watermark.png +%%DOCSDIR%%/html/images/used-in-examples/draganddrop/delayedencoding/images/drag.png +%%DOCSDIR%%/html/images/used-in-examples/draganddrop/draggableicons/images/boat.png +%%DOCSDIR%%/html/images/used-in-examples/draganddrop/draggableicons/images/car.png +%%DOCSDIR%%/html/images/used-in-examples/draganddrop/draggableicons/images/house.png +%%DOCSDIR%%/html/images/used-in-examples/effects/blurpicker/images/accessories-calculator.png +%%DOCSDIR%%/html/images/used-in-examples/effects/blurpicker/images/accessories-text-editor.png +%%DOCSDIR%%/html/images/used-in-examples/effects/blurpicker/images/help-browser.png +%%DOCSDIR%%/html/images/used-in-examples/effects/blurpicker/images/internet-group-chat.png +%%DOCSDIR%%/html/images/used-in-examples/effects/blurpicker/images/internet-mail.png +%%DOCSDIR%%/html/images/used-in-examples/effects/blurpicker/images/internet-web-browser.png +%%DOCSDIR%%/html/images/used-in-examples/effects/blurpicker/images/office-calendar.png +%%DOCSDIR%%/html/images/used-in-examples/effects/blurpicker/images/system-users.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/basicgraphicslayouts/images/block.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/diagramscene/images/background1.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/diagramscene/images/background2.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/diagramscene/images/background3.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/diagramscene/images/background4.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/diagramscene/images/bold.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/diagramscene/images/bringtofront.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/diagramscene/images/delete.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/diagramscene/images/floodfill.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/diagramscene/images/italic.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/diagramscene/images/linecolor.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/diagramscene/images/linepointer.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/diagramscene/images/pointer.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/diagramscene/images/sendtoback.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/diagramscene/images/textpointer.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/diagramscene/images/underline.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/dragdroprobot/images/head.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/padnavigator/images/artsfftscope.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/padnavigator/images/kontact_contacts.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/padnavigator/images/kontact_journal.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/padnavigator/images/kontact_mail.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/padnavigator/images/kontact_notes.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/padnavigator/images/kopeteavailable.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/padnavigator/images/metacontact_online.png +%%DOCSDIR%%/html/images/used-in-examples/graphicsview/padnavigator/images/minitools.png +%%DOCSDIR%%/html/images/used-in-examples/itemviews/pixelator/images/qt.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/application/images/copy.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/application/images/cut.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/application/images/new.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/application/images/open.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/application/images/paste.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/application/images/save.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/dockwidgets/images/new.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/dockwidgets/images/print.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/dockwidgets/images/save.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/dockwidgets/images/undo.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/mdi/images/copy.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/mdi/images/cut.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/mdi/images/new.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/mdi/images/open.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/mdi/images/paste.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/mdi/images/save.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/sdi/images/copy.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/sdi/images/cut.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/sdi/images/new.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/sdi/images/open.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/sdi/images/paste.png +%%DOCSDIR%%/html/images/used-in-examples/mainwindows/sdi/images/save.png +%%DOCSDIR%%/html/images/used-in-examples/network/qftp/images/cdtoparent.png +%%DOCSDIR%%/html/images/used-in-examples/network/qftp/images/dir.png +%%DOCSDIR%%/html/images/used-in-examples/network/qftp/images/file.png +%%DOCSDIR%%/html/images/used-in-examples/opengl/textures/images/side1.png +%%DOCSDIR%%/html/images/used-in-examples/opengl/textures/images/side2.png +%%DOCSDIR%%/html/images/used-in-examples/opengl/textures/images/side3.png +%%DOCSDIR%%/html/images/used-in-examples/opengl/textures/images/side4.png +%%DOCSDIR%%/html/images/used-in-examples/opengl/textures/images/side5.png +%%DOCSDIR%%/html/images/used-in-examples/opengl/textures/images/side6.png +%%DOCSDIR%%/html/images/used-in-examples/painting/basicdrawing/images/brick.png +%%DOCSDIR%%/html/images/used-in-examples/painting/basicdrawing/images/qt-logo.png +%%DOCSDIR%%/html/images/used-in-examples/painting/imagecomposition/images/background.png +%%DOCSDIR%%/html/images/used-in-examples/painting/imagecomposition/images/blackrectangle.png +%%DOCSDIR%%/html/images/used-in-examples/painting/imagecomposition/images/butterfly.png +%%DOCSDIR%%/html/images/used-in-examples/painting/imagecomposition/images/checker.png +%%DOCSDIR%%/html/images/used-in-examples/sql/drilldown/images/beijing.png +%%DOCSDIR%%/html/images/used-in-examples/sql/drilldown/images/berlin.png +%%DOCSDIR%%/html/images/used-in-examples/sql/drilldown/images/brisbane.png +%%DOCSDIR%%/html/images/used-in-examples/sql/drilldown/images/munich.png +%%DOCSDIR%%/html/images/used-in-examples/sql/drilldown/images/oslo.png +%%DOCSDIR%%/html/images/used-in-examples/sql/drilldown/images/redwood.png +%%DOCSDIR%%/html/images/used-in-examples/sql/masterdetail/images/icon.png +%%DOCSDIR%%/html/images/used-in-examples/sql/masterdetail/images/image.png +%%DOCSDIR%%/html/images/used-in-examples/tools/undoframework/images/cross.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/icons/images/designer.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/icons/images/find_disabled.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/icons/images/find_normal.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/icons/images/monkey_off_128x128.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/icons/images/monkey_off_16x16.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/icons/images/monkey_off_32x32.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/icons/images/monkey_off_64x64.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/icons/images/monkey_on_128x128.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/icons/images/monkey_on_16x16.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/icons/images/monkey_on_32x32.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/icons/images/monkey_on_64x64.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/icons/images/qt_extended_16x16.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/icons/images/qt_extended_32x32.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/icons/images/qt_extended_48x48.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/styles/images/woodbackground.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/styles/images/woodbutton.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/checkbox_checked.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/checkbox_checked_hover.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/checkbox_checked_pressed.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/checkbox_unchecked.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/checkbox_unchecked_hover.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/checkbox_unchecked_pressed.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/down_arrow.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/down_arrow_disabled.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/frame.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/pagefold.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/pushbutton.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/pushbutton_hover.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/pushbutton_pressed.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/radiobutton_checked.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/radiobutton_checked_hover.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/radiobutton_checked_pressed.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/radiobutton_unchecked.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/radiobutton_unchecked_hover.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/radiobutton_unchecked_pressed.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/sizegrip.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/spindown.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/spindown_hover.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/spindown_off.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/spindown_pressed.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/spinup.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/spinup_hover.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/spinup_off.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/spinup_pressed.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/up_arrow.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images/up_arrow_disabled.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/tooltips/images/circle.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/tooltips/images/square.png +%%DOCSDIR%%/html/images/used-in-examples/widgets/tooltips/images/triangle.png +%%DOCSDIR%%/html/images/video-videographicsitem.png +%%DOCSDIR%%/html/images/video-videowidget.png %%DOCSDIR%%/html/images/wVista-Cert-border-small.png +%%DOCSDIR%%/html/images/weatherinfo-demo.png +%%DOCSDIR%%/html/images/webkit-domtraversal.png %%DOCSDIR%%/html/images/webkit-examples.png -%%DOCSDIR%%/html/images/webkit-netscape-plugin.png +%%DOCSDIR%%/html/images/webkit-simpleselector.png +%%DOCSDIR%%/html/images/whatsnewanimatedtiles.png %%DOCSDIR%%/html/images/whatsthis.png %%DOCSDIR%%/html/images/widget-examples.png %%DOCSDIR%%/html/images/widgetdelegate.png @@ -1744,15 +2435,20 @@ %%DOCSDIR%%/html/images/worldtimeclockplugin-example.png %%DOCSDIR%%/html/images/x11_dependencies.png %%DOCSDIR%%/html/images/xml-examples.png +%%DOCSDIR%%/html/images/xml-schema.png %%DOCSDIR%%/html/images/xmlstreamexample-filemenu.png %%DOCSDIR%%/html/images/xmlstreamexample-helpmenu.png %%DOCSDIR%%/html/images/xmlstreamexample-screenshot.png +%%DOCSDIR%%/html/implicit-sharing.html %%DOCSDIR%%/html/index.html %%DOCSDIR%%/html/install-mac.html +%%DOCSDIR%%/html/install-symbian-installer.html +%%DOCSDIR%%/html/install-symbian.html %%DOCSDIR%%/html/install-win.html %%DOCSDIR%%/html/install-wince.html %%DOCSDIR%%/html/install-x11.html %%DOCSDIR%%/html/installation.html +%%DOCSDIR%%/html/internationalization.html %%DOCSDIR%%/html/intro-to-dbus.html %%DOCSDIR%%/html/io.html %%DOCSDIR%%/html/ipc-localfortuneclient-client-cpp.html @@ -1847,6 +2543,7 @@ %%DOCSDIR%%/html/itemviews-pixelator-imagemodel-cpp.html %%DOCSDIR%%/html/itemviews-pixelator-imagemodel-h.html %%DOCSDIR%%/html/itemviews-pixelator-images-qrc.html +%%DOCSDIR%%/html/itemviews-pixelator-images-qt-png.html %%DOCSDIR%%/html/itemviews-pixelator-main-cpp.html %%DOCSDIR%%/html/itemviews-pixelator-mainwindow-cpp.html %%DOCSDIR%%/html/itemviews-pixelator-mainwindow-h.html @@ -1926,6 +2623,7 @@ %%DOCSDIR%%/html/layouts-flowlayout-window-cpp.html %%DOCSDIR%%/html/layouts-flowlayout-window-h.html %%DOCSDIR%%/html/layouts-flowlayout.html +%%DOCSDIR%%/html/legal-easing.html %%DOCSDIR%%/html/lgpl.html %%DOCSDIR%%/html/licenses-fonts.html %%DOCSDIR%%/html/licenses.html @@ -1954,19 +2652,36 @@ %%DOCSDIR%%/html/linguist-ts-file-format.html %%DOCSDIR%%/html/linguist.dcf %%DOCSDIR%%/html/mac-differences.html -%%DOCSDIR%%/html/mainclasses.html +%%DOCSDIR%%/html/mainwindow-classes.html +%%DOCSDIR%%/html/mainwindow.html %%DOCSDIR%%/html/mainwindows-application-application-pro.html %%DOCSDIR%%/html/mainwindows-application-application-qrc.html +%%DOCSDIR%%/html/mainwindows-application-images-copy-png.html +%%DOCSDIR%%/html/mainwindows-application-images-cut-png.html +%%DOCSDIR%%/html/mainwindows-application-images-new-png.html +%%DOCSDIR%%/html/mainwindows-application-images-open-png.html +%%DOCSDIR%%/html/mainwindows-application-images-paste-png.html +%%DOCSDIR%%/html/mainwindows-application-images-save-png.html %%DOCSDIR%%/html/mainwindows-application-main-cpp.html %%DOCSDIR%%/html/mainwindows-application-mainwindow-cpp.html %%DOCSDIR%%/html/mainwindows-application-mainwindow-h.html %%DOCSDIR%%/html/mainwindows-application.html %%DOCSDIR%%/html/mainwindows-dockwidgets-dockwidgets-pro.html %%DOCSDIR%%/html/mainwindows-dockwidgets-dockwidgets-qrc.html +%%DOCSDIR%%/html/mainwindows-dockwidgets-images-new-png.html +%%DOCSDIR%%/html/mainwindows-dockwidgets-images-print-png.html +%%DOCSDIR%%/html/mainwindows-dockwidgets-images-save-png.html +%%DOCSDIR%%/html/mainwindows-dockwidgets-images-undo-png.html %%DOCSDIR%%/html/mainwindows-dockwidgets-main-cpp.html %%DOCSDIR%%/html/mainwindows-dockwidgets-mainwindow-cpp.html %%DOCSDIR%%/html/mainwindows-dockwidgets-mainwindow-h.html %%DOCSDIR%%/html/mainwindows-dockwidgets.html +%%DOCSDIR%%/html/mainwindows-mdi-images-copy-png.html +%%DOCSDIR%%/html/mainwindows-mdi-images-cut-png.html +%%DOCSDIR%%/html/mainwindows-mdi-images-new-png.html +%%DOCSDIR%%/html/mainwindows-mdi-images-open-png.html +%%DOCSDIR%%/html/mainwindows-mdi-images-paste-png.html +%%DOCSDIR%%/html/mainwindows-mdi-images-save-png.html %%DOCSDIR%%/html/mainwindows-mdi-main-cpp.html %%DOCSDIR%%/html/mainwindows-mdi-mainwindow-cpp.html %%DOCSDIR%%/html/mainwindows-mdi-mainwindow-h.html @@ -1985,6 +2700,12 @@ %%DOCSDIR%%/html/mainwindows-recentfiles-mainwindow-h.html %%DOCSDIR%%/html/mainwindows-recentfiles-recentfiles-pro.html %%DOCSDIR%%/html/mainwindows-recentfiles.html +%%DOCSDIR%%/html/mainwindows-sdi-images-copy-png.html +%%DOCSDIR%%/html/mainwindows-sdi-images-cut-png.html +%%DOCSDIR%%/html/mainwindows-sdi-images-new-png.html +%%DOCSDIR%%/html/mainwindows-sdi-images-open-png.html +%%DOCSDIR%%/html/mainwindows-sdi-images-paste-png.html +%%DOCSDIR%%/html/mainwindows-sdi-images-save-png.html %%DOCSDIR%%/html/mainwindows-sdi-main-cpp.html %%DOCSDIR%%/html/mainwindows-sdi-mainwindow-cpp.html %%DOCSDIR%%/html/mainwindows-sdi-mainwindow-h.html @@ -1992,7 +2713,6 @@ %%DOCSDIR%%/html/mainwindows-sdi-sdi-qrc.html %%DOCSDIR%%/html/mainwindows-sdi.html %%DOCSDIR%%/html/metaobjects.html -%%DOCSDIR%%/html/misc.html %%DOCSDIR%%/html/moc.html %%DOCSDIR%%/html/model-view-convenience.html %%DOCSDIR%%/html/model-view-creating-models.html @@ -2008,7 +2728,62 @@ %%DOCSDIR%%/html/model-view-view.html %%DOCSDIR%%/html/model-view.html %%DOCSDIR%%/html/modules.html -%%DOCSDIR%%/html/multimedia.html +%%DOCSDIR%%/html/multimedia-audiodevices-audiodevices-cpp.html +%%DOCSDIR%%/html/multimedia-audiodevices-audiodevices-h.html +%%DOCSDIR%%/html/multimedia-audiodevices-audiodevices-pro.html +%%DOCSDIR%%/html/multimedia-audiodevices-audiodevicesbase-ui.html +%%DOCSDIR%%/html/multimedia-audiodevices-main-cpp.html +%%DOCSDIR%%/html/multimedia-audiodevices.html +%%DOCSDIR%%/html/multimedia-audioinput-audioinput-cpp.html +%%DOCSDIR%%/html/multimedia-audioinput-audioinput-h.html +%%DOCSDIR%%/html/multimedia-audioinput-audioinput-pro.html +%%DOCSDIR%%/html/multimedia-audioinput-main-cpp.html +%%DOCSDIR%%/html/multimedia-audioinput.html +%%DOCSDIR%%/html/multimedia-audiooutput-audiooutput-cpp.html +%%DOCSDIR%%/html/multimedia-audiooutput-audiooutput-h.html +%%DOCSDIR%%/html/multimedia-audiooutput-audiooutput-pro.html +%%DOCSDIR%%/html/multimedia-audiooutput-main-cpp.html +%%DOCSDIR%%/html/multimedia-audiooutput.html +%%DOCSDIR%%/html/multimedia-videographicsitem-main-cpp.html +%%DOCSDIR%%/html/multimedia-videographicsitem-videographicsitem-pro.html +%%DOCSDIR%%/html/multimedia-videographicsitem-videoitem-cpp.html +%%DOCSDIR%%/html/multimedia-videographicsitem-videoitem-h.html +%%DOCSDIR%%/html/multimedia-videographicsitem-videoplayer-cpp.html +%%DOCSDIR%%/html/multimedia-videographicsitem-videoplayer-h.html +%%DOCSDIR%%/html/multimedia-videographicsitem.html +%%DOCSDIR%%/html/multimedia-videowidget-main-cpp.html +%%DOCSDIR%%/html/multimedia-videowidget-videoplayer-cpp.html +%%DOCSDIR%%/html/multimedia-videowidget-videoplayer-h.html +%%DOCSDIR%%/html/multimedia-videowidget-videowidget-cpp.html +%%DOCSDIR%%/html/multimedia-videowidget-videowidget-h.html +%%DOCSDIR%%/html/multimedia-videowidget-videowidget-pro.html +%%DOCSDIR%%/html/multimedia-videowidget-videowidgetsurface-cpp.html +%%DOCSDIR%%/html/multimedia-videowidget-videowidgetsurface-h.html +%%DOCSDIR%%/html/multimedia-videowidget.html +%%DOCSDIR%%/html/multitouch-dials-dials-pro.html +%%DOCSDIR%%/html/multitouch-dials-dials-ui.html +%%DOCSDIR%%/html/multitouch-dials-main-cpp.html +%%DOCSDIR%%/html/multitouch-dials.html +%%DOCSDIR%%/html/multitouch-fingerpaint-fingerpaint-pro.html +%%DOCSDIR%%/html/multitouch-fingerpaint-main-cpp.html +%%DOCSDIR%%/html/multitouch-fingerpaint-mainwindow-cpp.html +%%DOCSDIR%%/html/multitouch-fingerpaint-mainwindow-h.html +%%DOCSDIR%%/html/multitouch-fingerpaint-scribblearea-cpp.html +%%DOCSDIR%%/html/multitouch-fingerpaint-scribblearea-h.html +%%DOCSDIR%%/html/multitouch-fingerpaint.html +%%DOCSDIR%%/html/multitouch-knobs-knob-cpp.html +%%DOCSDIR%%/html/multitouch-knobs-knob-h.html +%%DOCSDIR%%/html/multitouch-knobs-knobs-pro.html +%%DOCSDIR%%/html/multitouch-knobs-main-cpp.html +%%DOCSDIR%%/html/multitouch-knobs.html +%%DOCSDIR%%/html/multitouch-pinchzoom-graphicsview-cpp.html +%%DOCSDIR%%/html/multitouch-pinchzoom-graphicsview-h.html +%%DOCSDIR%%/html/multitouch-pinchzoom-main-cpp.html +%%DOCSDIR%%/html/multitouch-pinchzoom-mice-qrc.html +%%DOCSDIR%%/html/multitouch-pinchzoom-mouse-cpp.html +%%DOCSDIR%%/html/multitouch-pinchzoom-mouse-h.html +%%DOCSDIR%%/html/multitouch-pinchzoom-pinchzoom-pro.html +%%DOCSDIR%%/html/multitouch-pinchzoom.html %%DOCSDIR%%/html/namespaces.html %%DOCSDIR%%/html/network-blockingfortuneclient-blockingclient-cpp.html %%DOCSDIR%%/html/network-blockingfortuneclient-blockingclient-h.html @@ -2037,12 +2812,6 @@ %%DOCSDIR%%/html/network-fortuneserver-server-cpp.html %%DOCSDIR%%/html/network-fortuneserver-server-h.html %%DOCSDIR%%/html/network-fortuneserver.html -%%DOCSDIR%%/html/network-ftp-ftp-pro.html -%%DOCSDIR%%/html/network-ftp-ftp-qrc.html -%%DOCSDIR%%/html/network-ftp-ftpwindow-cpp.html -%%DOCSDIR%%/html/network-ftp-ftpwindow-h.html -%%DOCSDIR%%/html/network-ftp-main-cpp.html -%%DOCSDIR%%/html/network-ftp.html %%DOCSDIR%%/html/network-googlesuggest-googlesuggest-cpp.html %%DOCSDIR%%/html/network-googlesuggest-googlesuggest-h.html %%DOCSDIR%%/html/network-googlesuggest-googlesuggest-pro.html @@ -2075,6 +2844,17 @@ %%DOCSDIR%%/html/network-network-chat-server-cpp.html %%DOCSDIR%%/html/network-network-chat-server-h.html %%DOCSDIR%%/html/network-network-chat.html +%%DOCSDIR%%/html/network-programming.html +%%DOCSDIR%%/html/network-qftp-ftp-qrc.html +%%DOCSDIR%%/html/network-qftp-ftpwindow-cpp.html +%%DOCSDIR%%/html/network-qftp-ftpwindow-h.html +%%DOCSDIR%%/html/network-qftp-images-cdtoparent-png.html +%%DOCSDIR%%/html/network-qftp-images-dir-png.html +%%DOCSDIR%%/html/network-qftp-images-file-png.html +%%DOCSDIR%%/html/network-qftp-main-cpp.html +%%DOCSDIR%%/html/network-qftp-qftp-pro.html +%%DOCSDIR%%/html/network-qftp-sym-iap-util-h.html +%%DOCSDIR%%/html/network-qftp.html %%DOCSDIR%%/html/network-securesocketclient-certificateinfo-cpp.html %%DOCSDIR%%/html/network-securesocketclient-certificateinfo-h.html %%DOCSDIR%%/html/network-securesocketclient-certificateinfo-ui.html @@ -2122,9 +2902,10 @@ %%DOCSDIR%%/html/network-torrent-trackerclient-cpp.html %%DOCSDIR%%/html/network-torrent-trackerclient-h.html %%DOCSDIR%%/html/network-torrent.html +%%DOCSDIR%%/html/network.html %%DOCSDIR%%/html/object.html -%%DOCSDIR%%/html/objectmodel.html %%DOCSDIR%%/html/objecttrees.html +%%DOCSDIR%%/html/obsoleteclasses.html %%DOCSDIR%%/html/opengl-2dpainting-2dpainting-pro.html %%DOCSDIR%%/html/opengl-2dpainting-glwidget-cpp.html %%DOCSDIR%%/html/opengl-2dpainting-glwidget-h.html @@ -2181,6 +2962,8 @@ %%DOCSDIR%%/html/opengl-overpainting-main-cpp.html %%DOCSDIR%%/html/opengl-overpainting-overpainting-pro.html %%DOCSDIR%%/html/opengl-overpainting.html +%%DOCSDIR%%/html/opengl-pbuffers-cube-cpp.html +%%DOCSDIR%%/html/opengl-pbuffers-cube-h.html %%DOCSDIR%%/html/opengl-pbuffers-glwidget-cpp.html %%DOCSDIR%%/html/opengl-pbuffers-glwidget-h.html %%DOCSDIR%%/html/opengl-pbuffers-main-cpp.html @@ -2201,6 +2984,12 @@ %%DOCSDIR%%/html/opengl-samplebuffers.html %%DOCSDIR%%/html/opengl-textures-glwidget-cpp.html %%DOCSDIR%%/html/opengl-textures-glwidget-h.html +%%DOCSDIR%%/html/opengl-textures-images-side1-png.html +%%DOCSDIR%%/html/opengl-textures-images-side2-png.html +%%DOCSDIR%%/html/opengl-textures-images-side3-png.html +%%DOCSDIR%%/html/opengl-textures-images-side4-png.html +%%DOCSDIR%%/html/opengl-textures-images-side5-png.html +%%DOCSDIR%%/html/opengl-textures-images-side6-png.html %%DOCSDIR%%/html/opengl-textures-main-cpp.html %%DOCSDIR%%/html/opengl-textures-textures-pro.html %%DOCSDIR%%/html/opengl-textures-textures-qrc.html @@ -2208,10 +2997,19 @@ %%DOCSDIR%%/html/opengl-textures-window-h.html %%DOCSDIR%%/html/opengl-textures.html %%DOCSDIR%%/html/opensourceedition.html +%%DOCSDIR%%/html/openvg-star-main-cpp.html +%%DOCSDIR%%/html/openvg-star-star-pro.html +%%DOCSDIR%%/html/openvg-star-starwidget-cpp.html +%%DOCSDIR%%/html/openvg-star-starwidget-h.html +%%DOCSDIR%%/html/openvg-star.html +%%DOCSDIR%%/html/openvg.html %%DOCSDIR%%/html/organizers.html %%DOCSDIR%%/html/overviews.html +%%DOCSDIR%%/html/painting-3d.html %%DOCSDIR%%/html/painting-basicdrawing-basicdrawing-pro.html %%DOCSDIR%%/html/painting-basicdrawing-basicdrawing-qrc.html +%%DOCSDIR%%/html/painting-basicdrawing-images-brick-png.html +%%DOCSDIR%%/html/painting-basicdrawing-images-qt-logo-png.html %%DOCSDIR%%/html/painting-basicdrawing-main-cpp.html %%DOCSDIR%%/html/painting-basicdrawing-renderarea-cpp.html %%DOCSDIR%%/html/painting-basicdrawing-renderarea-h.html @@ -2235,6 +3033,10 @@ %%DOCSDIR%%/html/painting-imagecomposition-imagecomposer-h.html %%DOCSDIR%%/html/painting-imagecomposition-imagecomposition-pro.html %%DOCSDIR%%/html/painting-imagecomposition-imagecomposition-qrc.html +%%DOCSDIR%%/html/painting-imagecomposition-images-background-png.html +%%DOCSDIR%%/html/painting-imagecomposition-images-blackrectangle-png.html +%%DOCSDIR%%/html/painting-imagecomposition-images-butterfly-png.html +%%DOCSDIR%%/html/painting-imagecomposition-images-checker-png.html %%DOCSDIR%%/html/painting-imagecomposition-main-cpp.html %%DOCSDIR%%/html/painting-imagecomposition.html %%DOCSDIR%%/html/painting-painterpaths-main-cpp.html @@ -2271,6 +3073,11 @@ %%DOCSDIR%%/html/painting-transformations-window-cpp.html %%DOCSDIR%%/html/painting-transformations-window-h.html %%DOCSDIR%%/html/painting-transformations.html +%%DOCSDIR%%/html/painting.html +%%DOCSDIR%%/html/paintsystem-devices.html +%%DOCSDIR%%/html/paintsystem-drawing.html +%%DOCSDIR%%/html/paintsystem-images.html +%%DOCSDIR%%/html/paintsystem-styling.html %%DOCSDIR%%/html/paintsystem.html %%DOCSDIR%%/html/pdf-licensing.html %%DOCSDIR%%/html/phonon-audiooutput-members.html @@ -2298,16 +3105,16 @@ %%DOCSDIR%%/html/phonon-mediasource-members.html %%DOCSDIR%%/html/phonon-mediasource.html %%DOCSDIR%%/html/phonon-module.html -%%DOCSDIR%%/html/phonon-musicplayer-main-cpp.html -%%DOCSDIR%%/html/phonon-musicplayer-mainwindow-cpp.html -%%DOCSDIR%%/html/phonon-musicplayer-mainwindow-h.html -%%DOCSDIR%%/html/phonon-musicplayer-musicplayer-pro.html -%%DOCSDIR%%/html/phonon-musicplayer.html %%DOCSDIR%%/html/phonon-objectdescription-members.html %%DOCSDIR%%/html/phonon-objectdescription.html %%DOCSDIR%%/html/phonon-overview.html %%DOCSDIR%%/html/phonon-path-members.html %%DOCSDIR%%/html/phonon-path.html +%%DOCSDIR%%/html/phonon-qmusicplayer-main-cpp.html +%%DOCSDIR%%/html/phonon-qmusicplayer-mainwindow-cpp.html +%%DOCSDIR%%/html/phonon-qmusicplayer-mainwindow-h.html +%%DOCSDIR%%/html/phonon-qmusicplayer-qmusicplayer-pro.html +%%DOCSDIR%%/html/phonon-qmusicplayer.html %%DOCSDIR%%/html/phonon-seekslider-members.html %%DOCSDIR%%/html/phonon-seekslider.html %%DOCSDIR%%/html/phonon-videoplayer-members.html @@ -2319,11 +3126,14 @@ %%DOCSDIR%%/html/phonon.html %%DOCSDIR%%/html/platform-notes-embedded-linux.html %%DOCSDIR%%/html/platform-notes-mac.html -%%DOCSDIR%%/html/platform-notes-platforms.html +%%DOCSDIR%%/html/platform-notes-qnx.html +%%DOCSDIR%%/html/platform-notes-symbian.html +%%DOCSDIR%%/html/platform-notes-vxworks.html %%DOCSDIR%%/html/platform-notes-windows-ce.html %%DOCSDIR%%/html/platform-notes-windows.html %%DOCSDIR%%/html/platform-notes-x11.html %%DOCSDIR%%/html/platform-notes.html +%%DOCSDIR%%/html/platform-specific.html %%DOCSDIR%%/html/plugins-howto.html %%DOCSDIR%%/html/plugins.html %%DOCSDIR%%/html/porting-qsa.html @@ -2648,6 +3458,8 @@ %%DOCSDIR%%/html/q3wizard-members.html %%DOCSDIR%%/html/q3wizard-obsolete.html %%DOCSDIR%%/html/q3wizard.html +%%DOCSDIR%%/html/qabstractanimation-members.html +%%DOCSDIR%%/html/qabstractanimation.html %%DOCSDIR%%/html/qabstractbutton-members.html %%DOCSDIR%%/html/qabstractbutton-qt3.html %%DOCSDIR%%/html/qabstractbutton.html @@ -2671,6 +3483,12 @@ %%DOCSDIR%%/html/qabstractfileenginehandler.html %%DOCSDIR%%/html/qabstractfileengineiterator-members.html %%DOCSDIR%%/html/qabstractfileengineiterator.html +%%DOCSDIR%%/html/qabstractfontengine-fixedpoint-members.html +%%DOCSDIR%%/html/qabstractfontengine-fixedpoint.html +%%DOCSDIR%%/html/qabstractfontengine-glyphmetrics-members.html +%%DOCSDIR%%/html/qabstractfontengine-glyphmetrics.html +%%DOCSDIR%%/html/qabstractfontengine-members.html +%%DOCSDIR%%/html/qabstractfontengine.html %%DOCSDIR%%/html/qabstractformbuilder-members.html %%DOCSDIR%%/html/qabstractformbuilder.html %%DOCSDIR%%/html/qabstractgraphicsshapeitem-members.html @@ -2705,6 +3523,8 @@ %%DOCSDIR%%/html/qabstractsocket.html %%DOCSDIR%%/html/qabstractspinbox-members.html %%DOCSDIR%%/html/qabstractspinbox.html +%%DOCSDIR%%/html/qabstractstate-members.html +%%DOCSDIR%%/html/qabstractstate.html %%DOCSDIR%%/html/qabstracttablemodel-members.html %%DOCSDIR%%/html/qabstracttablemodel.html %%DOCSDIR%%/html/qabstracttextdocumentlayout-members.html @@ -2713,8 +3533,14 @@ %%DOCSDIR%%/html/qabstracttextdocumentlayout-selection-members.html %%DOCSDIR%%/html/qabstracttextdocumentlayout-selection.html %%DOCSDIR%%/html/qabstracttextdocumentlayout.html +%%DOCSDIR%%/html/qabstracttransition-members.html +%%DOCSDIR%%/html/qabstracttransition.html %%DOCSDIR%%/html/qabstracturiresolver-members.html %%DOCSDIR%%/html/qabstracturiresolver.html +%%DOCSDIR%%/html/qabstractvideobuffer-members.html +%%DOCSDIR%%/html/qabstractvideobuffer.html +%%DOCSDIR%%/html/qabstractvideosurface-members.html +%%DOCSDIR%%/html/qabstractvideosurface.html %%DOCSDIR%%/html/qabstractxmlnodemodel-members.html %%DOCSDIR%%/html/qabstractxmlnodemodel.html %%DOCSDIR%%/html/qabstractxmlreceiver-members.html @@ -2743,6 +3569,8 @@ %%DOCSDIR%%/html/qactiongroup-members.html %%DOCSDIR%%/html/qactiongroup-qt3.html %%DOCSDIR%%/html/qactiongroup.html +%%DOCSDIR%%/html/qanimationgroup-members.html +%%DOCSDIR%%/html/qanimationgroup.html %%DOCSDIR%%/html/qapplication-members.html %%DOCSDIR%%/html/qapplication-qt3.html %%DOCSDIR%%/html/qapplication.html @@ -2752,15 +3580,49 @@ %%DOCSDIR%%/html/qatomicint.html %%DOCSDIR%%/html/qatomicpointer-members.html %%DOCSDIR%%/html/qatomicpointer.html +%%DOCSDIR%%/html/qaudio.html +%%DOCSDIR%%/html/qaudiodeviceinfo-members.html +%%DOCSDIR%%/html/qaudiodeviceinfo.html +%%DOCSDIR%%/html/qaudioformat-members.html +%%DOCSDIR%%/html/qaudioformat.html +%%DOCSDIR%%/html/qaudioinput-members.html +%%DOCSDIR%%/html/qaudioinput.html +%%DOCSDIR%%/html/qaudiooutput-members.html +%%DOCSDIR%%/html/qaudiooutput.html %%DOCSDIR%%/html/qauthenticator-members.html %%DOCSDIR%%/html/qauthenticator.html +%%DOCSDIR%%/html/qaxaggregated-members.html +%%DOCSDIR%%/html/qaxaggregated.html +%%DOCSDIR%%/html/qaxbase-members.html +%%DOCSDIR%%/html/qaxbase.html +%%DOCSDIR%%/html/qaxbindable-members.html +%%DOCSDIR%%/html/qaxbindable.html %%DOCSDIR%%/html/qaxcontainer.html +%%DOCSDIR%%/html/qaxfactory-members.html +%%DOCSDIR%%/html/qaxfactory.html +%%DOCSDIR%%/html/qaxobject-members.html +%%DOCSDIR%%/html/qaxobject.html +%%DOCSDIR%%/html/qaxscript-members.html +%%DOCSDIR%%/html/qaxscript.html +%%DOCSDIR%%/html/qaxscriptengine-members.html +%%DOCSDIR%%/html/qaxscriptengine.html +%%DOCSDIR%%/html/qaxscriptmanager-members.html +%%DOCSDIR%%/html/qaxscriptmanager.html +%%DOCSDIR%%/html/qaxserver-demo-hierarchy.html +%%DOCSDIR%%/html/qaxserver-demo-menus.html +%%DOCSDIR%%/html/qaxserver-demo-multiple.html +%%DOCSDIR%%/html/qaxserver-demo-opengl.html +%%DOCSDIR%%/html/qaxserver-demo-simple.html +%%DOCSDIR%%/html/qaxserver-demo-wrapper.html %%DOCSDIR%%/html/qaxserver.html +%%DOCSDIR%%/html/qaxwidget-members.html +%%DOCSDIR%%/html/qaxwidget.html %%DOCSDIR%%/html/qbasictimer-members.html %%DOCSDIR%%/html/qbasictimer.html %%DOCSDIR%%/html/qbitarray-members.html %%DOCSDIR%%/html/qbitarray.html %%DOCSDIR%%/html/qbitmap-members.html +%%DOCSDIR%%/html/qbitmap-obsolete.html %%DOCSDIR%%/html/qbitmap-qt3.html %%DOCSDIR%%/html/qbitmap.html %%DOCSDIR%%/html/qboxlayout-members.html @@ -2836,6 +3698,11 @@ %%DOCSDIR%%/html/qcontextmenuevent-members.html %%DOCSDIR%%/html/qcontextmenuevent-qt3.html %%DOCSDIR%%/html/qcontextmenuevent.html +%%DOCSDIR%%/html/qcontiguouscache-members.html +%%DOCSDIR%%/html/qcontiguouscache.html +%%DOCSDIR%%/html/qcopchannel-members.html +%%DOCSDIR%%/html/qcopchannel-qt3.html +%%DOCSDIR%%/html/qcopchannel.html %%DOCSDIR%%/html/qcoreapplication-members.html %%DOCSDIR%%/html/qcoreapplication-qt3.html %%DOCSDIR%%/html/qcoreapplication.html @@ -2899,6 +3766,8 @@ %%DOCSDIR%%/html/qdbusreply.html %%DOCSDIR%%/html/qdbusserver-members.html %%DOCSDIR%%/html/qdbusserver.html +%%DOCSDIR%%/html/qdbusservicewatcher-members.html +%%DOCSDIR%%/html/qdbusservicewatcher.html %%DOCSDIR%%/html/qdbussignature-members.html %%DOCSDIR%%/html/qdbussignature.html %%DOCSDIR%%/html/qdbustypesystem.html @@ -2908,6 +3777,14 @@ %%DOCSDIR%%/html/qdbusxml2cpp.html %%DOCSDIR%%/html/qdebug-members.html %%DOCSDIR%%/html/qdebug.html +%%DOCSDIR%%/html/qdecoration-members.html +%%DOCSDIR%%/html/qdecoration.html +%%DOCSDIR%%/html/qdecorationdefault-members.html +%%DOCSDIR%%/html/qdecorationdefault.html +%%DOCSDIR%%/html/qdecorationfactory-members.html +%%DOCSDIR%%/html/qdecorationfactory.html +%%DOCSDIR%%/html/qdecorationplugin-members.html +%%DOCSDIR%%/html/qdecorationplugin.html %%DOCSDIR%%/html/qdesigneractioneditorinterface-members.html %%DOCSDIR%%/html/qdesigneractioneditorinterface.html %%DOCSDIR%%/html/qdesignercontainerextension-members.html @@ -2941,6 +3818,7 @@ %%DOCSDIR%%/html/qdesktopservices-members.html %%DOCSDIR%%/html/qdesktopservices.html %%DOCSDIR%%/html/qdesktopwidget-members.html +%%DOCSDIR%%/html/qdesktopwidget-obsolete.html %%DOCSDIR%%/html/qdesktopwidget.html %%DOCSDIR%%/html/qdial-members.html %%DOCSDIR%%/html/qdial-qt3.html @@ -2955,6 +3833,9 @@ %%DOCSDIR%%/html/qdir-obsolete.html %%DOCSDIR%%/html/qdir-qt3.html %%DOCSDIR%%/html/qdir.html +%%DOCSDIR%%/html/qdirectpainter-members.html +%%DOCSDIR%%/html/qdirectpainter-obsolete.html +%%DOCSDIR%%/html/qdirectpainter.html %%DOCSDIR%%/html/qdiriterator-members.html %%DOCSDIR%%/html/qdiriterator.html %%DOCSDIR%%/html/qdirmodel-members.html @@ -3010,11 +3891,14 @@ %%DOCSDIR%%/html/qdragmoveevent-members.html %%DOCSDIR%%/html/qdragmoveevent-qt3.html %%DOCSDIR%%/html/qdragmoveevent.html +%%DOCSDIR%%/html/qdrawutil-h.html %%DOCSDIR%%/html/qdropevent-members.html %%DOCSDIR%%/html/qdropevent-qt3.html %%DOCSDIR%%/html/qdropevent.html %%DOCSDIR%%/html/qdynamicpropertychangeevent-members.html %%DOCSDIR%%/html/qdynamicpropertychangeevent.html +%%DOCSDIR%%/html/qeasingcurve-members.html +%%DOCSDIR%%/html/qeasingcurve.html %%DOCSDIR%%/html/qerrormessage-members.html %%DOCSDIR%%/html/qerrormessage-qt3.html %%DOCSDIR%%/html/qerrormessage.html @@ -3022,6 +3906,8 @@ %%DOCSDIR%%/html/qevent.html %%DOCSDIR%%/html/qeventloop-members.html %%DOCSDIR%%/html/qeventloop.html +%%DOCSDIR%%/html/qeventtransition-members.html +%%DOCSDIR%%/html/qeventtransition.html %%DOCSDIR%%/html/qexplicitlyshareddatapointer-members.html %%DOCSDIR%%/html/qexplicitlyshareddatapointer.html %%DOCSDIR%%/html/qextensionfactory-members.html @@ -3048,6 +3934,8 @@ %%DOCSDIR%%/html/qfilesystemmodel.html %%DOCSDIR%%/html/qfilesystemwatcher-members.html %%DOCSDIR%%/html/qfilesystemwatcher.html +%%DOCSDIR%%/html/qfinalstate-members.html +%%DOCSDIR%%/html/qfinalstate.html %%DOCSDIR%%/html/qflag-members.html %%DOCSDIR%%/html/qflag.html %%DOCSDIR%%/html/qflags-members.html @@ -3066,6 +3954,10 @@ %%DOCSDIR%%/html/qfontdatabase.html %%DOCSDIR%%/html/qfontdialog-members.html %%DOCSDIR%%/html/qfontdialog.html +%%DOCSDIR%%/html/qfontengineinfo-members.html +%%DOCSDIR%%/html/qfontengineinfo.html +%%DOCSDIR%%/html/qfontengineplugin-members.html +%%DOCSDIR%%/html/qfontengineplugin.html %%DOCSDIR%%/html/qfontinfo-members.html %%DOCSDIR%%/html/qfontinfo.html %%DOCSDIR%%/html/qfontmetrics-members.html @@ -3098,8 +3990,16 @@ %%DOCSDIR%%/html/qfuturewatcher.html %%DOCSDIR%%/html/qgenericargument-members.html %%DOCSDIR%%/html/qgenericargument.html +%%DOCSDIR%%/html/qgenericmatrix-members.html +%%DOCSDIR%%/html/qgenericmatrix.html %%DOCSDIR%%/html/qgenericreturnargument-members.html %%DOCSDIR%%/html/qgenericreturnargument.html +%%DOCSDIR%%/html/qgesture-members.html +%%DOCSDIR%%/html/qgesture.html +%%DOCSDIR%%/html/qgestureevent-members.html +%%DOCSDIR%%/html/qgestureevent.html +%%DOCSDIR%%/html/qgesturerecognizer-members.html +%%DOCSDIR%%/html/qgesturerecognizer.html %%DOCSDIR%%/html/qgl.html %%DOCSDIR%%/html/qglcolormap-members.html %%DOCSDIR%%/html/qglcolormap.html @@ -3110,14 +4010,32 @@ %%DOCSDIR%%/html/qglformat.html %%DOCSDIR%%/html/qglframebufferobject-members.html %%DOCSDIR%%/html/qglframebufferobject.html +%%DOCSDIR%%/html/qglframebufferobjectformat-members.html +%%DOCSDIR%%/html/qglframebufferobjectformat.html %%DOCSDIR%%/html/qglpixelbuffer-members.html %%DOCSDIR%%/html/qglpixelbuffer.html +%%DOCSDIR%%/html/qglshader-members.html +%%DOCSDIR%%/html/qglshader.html +%%DOCSDIR%%/html/qglshaderprogram-members.html +%%DOCSDIR%%/html/qglshaderprogram.html %%DOCSDIR%%/html/qglwidget-members.html %%DOCSDIR%%/html/qglwidget-obsolete.html %%DOCSDIR%%/html/qglwidget-qt3.html %%DOCSDIR%%/html/qglwidget.html %%DOCSDIR%%/html/qgradient-members.html %%DOCSDIR%%/html/qgradient.html +%%DOCSDIR%%/html/qgraphicsanchor-members.html +%%DOCSDIR%%/html/qgraphicsanchor.html +%%DOCSDIR%%/html/qgraphicsanchorlayout-members.html +%%DOCSDIR%%/html/qgraphicsanchorlayout.html +%%DOCSDIR%%/html/qgraphicsblureffect-members.html +%%DOCSDIR%%/html/qgraphicsblureffect.html +%%DOCSDIR%%/html/qgraphicscolorizeeffect-members.html +%%DOCSDIR%%/html/qgraphicscolorizeeffect.html +%%DOCSDIR%%/html/qgraphicsdropshadoweffect-members.html +%%DOCSDIR%%/html/qgraphicsdropshadoweffect.html +%%DOCSDIR%%/html/qgraphicseffect-members.html +%%DOCSDIR%%/html/qgraphicseffect.html %%DOCSDIR%%/html/qgraphicsellipseitem-members.html %%DOCSDIR%%/html/qgraphicsellipseitem.html %%DOCSDIR%%/html/qgraphicsgridlayout-members.html @@ -3138,6 +4056,10 @@ %%DOCSDIR%%/html/qgraphicslinearlayout.html %%DOCSDIR%%/html/qgraphicslineitem-members.html %%DOCSDIR%%/html/qgraphicslineitem.html +%%DOCSDIR%%/html/qgraphicsobject-members.html +%%DOCSDIR%%/html/qgraphicsobject.html +%%DOCSDIR%%/html/qgraphicsopacityeffect-members.html +%%DOCSDIR%%/html/qgraphicsopacityeffect.html %%DOCSDIR%%/html/qgraphicspathitem-members.html %%DOCSDIR%%/html/qgraphicspathitem.html %%DOCSDIR%%/html/qgraphicspixmapitem-members.html @@ -3148,7 +4070,12 @@ %%DOCSDIR%%/html/qgraphicsproxywidget.html %%DOCSDIR%%/html/qgraphicsrectitem-members.html %%DOCSDIR%%/html/qgraphicsrectitem.html +%%DOCSDIR%%/html/qgraphicsrotation-members.html +%%DOCSDIR%%/html/qgraphicsrotation.html +%%DOCSDIR%%/html/qgraphicsscale-members.html +%%DOCSDIR%%/html/qgraphicsscale.html %%DOCSDIR%%/html/qgraphicsscene-members.html +%%DOCSDIR%%/html/qgraphicsscene-obsolete.html %%DOCSDIR%%/html/qgraphicsscene.html %%DOCSDIR%%/html/qgraphicsscenecontextmenuevent-members.html %%DOCSDIR%%/html/qgraphicsscenecontextmenuevent.html @@ -3175,8 +4102,13 @@ %%DOCSDIR%%/html/qgraphicssvgitem.html %%DOCSDIR%%/html/qgraphicstextitem-members.html %%DOCSDIR%%/html/qgraphicstextitem.html +%%DOCSDIR%%/html/qgraphicstransform-members.html +%%DOCSDIR%%/html/qgraphicstransform.html %%DOCSDIR%%/html/qgraphicsview-members.html +%%DOCSDIR%%/html/qgraphicsview-obsolete.html %%DOCSDIR%%/html/qgraphicsview.html +%%DOCSDIR%%/html/qgraphicswebview-members.html +%%DOCSDIR%%/html/qgraphicswebview.html %%DOCSDIR%%/html/qgraphicswidget-members.html %%DOCSDIR%%/html/qgraphicswidget.html %%DOCSDIR%%/html/qgridlayout-members.html @@ -3217,6 +4149,7 @@ %%DOCSDIR%%/html/qhelpindexwidget-members.html %%DOCSDIR%%/html/qhelpindexwidget.html %%DOCSDIR%%/html/qhelpsearchengine-members.html +%%DOCSDIR%%/html/qhelpsearchengine-qt3.html %%DOCSDIR%%/html/qhelpsearchengine.html %%DOCSDIR%%/html/qhelpsearchquery-members.html %%DOCSDIR%%/html/qhelpsearchquery.html @@ -3226,6 +4159,8 @@ %%DOCSDIR%%/html/qhelpsearchresultwidget.html %%DOCSDIR%%/html/qhideevent-members.html %%DOCSDIR%%/html/qhideevent.html +%%DOCSDIR%%/html/qhistorystate-members.html +%%DOCSDIR%%/html/qhistorystate.html %%DOCSDIR%%/html/qhostaddress-members.html %%DOCSDIR%%/html/qhostaddress-qt3.html %%DOCSDIR%%/html/qhostaddress.html @@ -3310,9 +4245,15 @@ %%DOCSDIR%%/html/qitemselectionrange-members.html %%DOCSDIR%%/html/qitemselectionrange-obsolete.html %%DOCSDIR%%/html/qitemselectionrange.html +%%DOCSDIR%%/html/qkbddriverfactory-members.html +%%DOCSDIR%%/html/qkbddriverfactory.html +%%DOCSDIR%%/html/qkbddriverplugin-members.html +%%DOCSDIR%%/html/qkbddriverplugin.html %%DOCSDIR%%/html/qkeyevent-members.html %%DOCSDIR%%/html/qkeyevent-qt3.html %%DOCSDIR%%/html/qkeyevent.html +%%DOCSDIR%%/html/qkeyeventtransition-members.html +%%DOCSDIR%%/html/qkeyeventtransition.html %%DOCSDIR%%/html/qkeysequence-members.html %%DOCSDIR%%/html/qkeysequence-obsolete.html %%DOCSDIR%%/html/qkeysequence.html @@ -3381,6 +4322,15 @@ %%DOCSDIR%%/html/qlocalserver.html %%DOCSDIR%%/html/qlocalsocket-members.html %%DOCSDIR%%/html/qlocalsocket.html +%%DOCSDIR%%/html/qmaccocoaviewcontainer-members.html +%%DOCSDIR%%/html/qmaccocoaviewcontainer.html +%%DOCSDIR%%/html/qmacnativewidget-members.html +%%DOCSDIR%%/html/qmacnativewidget.html +%%DOCSDIR%%/html/qmacpasteboardmime-members.html +%%DOCSDIR%%/html/qmacpasteboardmime.html +%%DOCSDIR%%/html/qmacstyle-members.html +%%DOCSDIR%%/html/qmacstyle-obsolete.html +%%DOCSDIR%%/html/qmacstyle.html %%DOCSDIR%%/html/qmainwindow-members.html %%DOCSDIR%%/html/qmainwindow-qt3.html %%DOCSDIR%%/html/qmainwindow.html @@ -3409,9 +4359,13 @@ %%DOCSDIR%%/html/qmap.html %%DOCSDIR%%/html/qmapiterator-members.html %%DOCSDIR%%/html/qmapiterator.html +%%DOCSDIR%%/html/qmargins-members.html +%%DOCSDIR%%/html/qmargins.html %%DOCSDIR%%/html/qmatrix-members.html %%DOCSDIR%%/html/qmatrix-qt3.html %%DOCSDIR%%/html/qmatrix.html +%%DOCSDIR%%/html/qmatrix4x4-members.html +%%DOCSDIR%%/html/qmatrix4x4.html %%DOCSDIR%%/html/qmdiarea-members.html %%DOCSDIR%%/html/qmdiarea.html %%DOCSDIR%%/html/qmdisubwindow-members.html @@ -3450,9 +4404,15 @@ %%DOCSDIR%%/html/qmodelindex.html %%DOCSDIR%%/html/qmotifstyle-members.html %%DOCSDIR%%/html/qmotifstyle.html +%%DOCSDIR%%/html/qmousedriverfactory-members.html +%%DOCSDIR%%/html/qmousedriverfactory.html +%%DOCSDIR%%/html/qmousedriverplugin-members.html +%%DOCSDIR%%/html/qmousedriverplugin.html %%DOCSDIR%%/html/qmouseevent-members.html %%DOCSDIR%%/html/qmouseevent-qt3.html %%DOCSDIR%%/html/qmouseevent.html +%%DOCSDIR%%/html/qmouseeventtransition-members.html +%%DOCSDIR%%/html/qmouseeventtransition.html %%DOCSDIR%%/html/qmoveevent-members.html %%DOCSDIR%%/html/qmoveevent.html %%DOCSDIR%%/html/qmovie-members.html @@ -3517,6 +4477,7 @@ %%DOCSDIR%%/html/qpaintengine-members.html %%DOCSDIR%%/html/qpaintengine.html %%DOCSDIR%%/html/qpaintenginestate-members.html +%%DOCSDIR%%/html/qpaintenginestate-obsolete.html %%DOCSDIR%%/html/qpaintenginestate.html %%DOCSDIR%%/html/qpainter-members.html %%DOCSDIR%%/html/qpainter-obsolete.html @@ -3538,6 +4499,12 @@ %%DOCSDIR%%/html/qpalette-obsolete.html %%DOCSDIR%%/html/qpalette-qt3.html %%DOCSDIR%%/html/qpalette.html +%%DOCSDIR%%/html/qpangesture-members.html +%%DOCSDIR%%/html/qpangesture.html +%%DOCSDIR%%/html/qparallelanimationgroup-members.html +%%DOCSDIR%%/html/qparallelanimationgroup.html +%%DOCSDIR%%/html/qpauseanimation-members.html +%%DOCSDIR%%/html/qpauseanimation.html %%DOCSDIR%%/html/qpen-members.html %%DOCSDIR%%/html/qpen.html %%DOCSDIR%%/html/qpersistentmodelindex-members.html @@ -3550,10 +4517,14 @@ %%DOCSDIR%%/html/qpictureformatplugin.html %%DOCSDIR%%/html/qpictureio-members.html %%DOCSDIR%%/html/qpictureio.html +%%DOCSDIR%%/html/qpinchgesture-members.html +%%DOCSDIR%%/html/qpinchgesture.html %%DOCSDIR%%/html/qpixmap-members.html %%DOCSDIR%%/html/qpixmap-obsolete.html %%DOCSDIR%%/html/qpixmap-qt3.html %%DOCSDIR%%/html/qpixmap.html +%%DOCSDIR%%/html/qpixmapcache-key-members.html +%%DOCSDIR%%/html/qpixmapcache-key.html %%DOCSDIR%%/html/qpixmapcache-members.html %%DOCSDIR%%/html/qpixmapcache-obsolete.html %%DOCSDIR%%/html/qpixmapcache.html @@ -3588,19 +4559,32 @@ %%DOCSDIR%%/html/qprintpreviewdialog-members.html %%DOCSDIR%%/html/qprintpreviewdialog.html %%DOCSDIR%%/html/qprintpreviewwidget-members.html +%%DOCSDIR%%/html/qprintpreviewwidget-qt3.html %%DOCSDIR%%/html/qprintpreviewwidget.html %%DOCSDIR%%/html/qprocess-members.html %%DOCSDIR%%/html/qprocess-obsolete.html %%DOCSDIR%%/html/qprocess.html +%%DOCSDIR%%/html/qprocessenvironment-members.html +%%DOCSDIR%%/html/qprocessenvironment.html %%DOCSDIR%%/html/qprogressbar-members.html %%DOCSDIR%%/html/qprogressbar.html %%DOCSDIR%%/html/qprogressdialog-members.html %%DOCSDIR%%/html/qprogressdialog.html +%%DOCSDIR%%/html/qpropertyanimation-members.html +%%DOCSDIR%%/html/qpropertyanimation.html %%DOCSDIR%%/html/qproxymodel-members.html %%DOCSDIR%%/html/qproxymodel.html +%%DOCSDIR%%/html/qproxyscreen-members.html +%%DOCSDIR%%/html/qproxyscreen.html +%%DOCSDIR%%/html/qproxyscreencursor-members.html +%%DOCSDIR%%/html/qproxyscreencursor.html +%%DOCSDIR%%/html/qproxystyle-members.html +%%DOCSDIR%%/html/qproxystyle.html %%DOCSDIR%%/html/qpushbutton-members.html %%DOCSDIR%%/html/qpushbutton-qt3.html %%DOCSDIR%%/html/qpushbutton.html +%%DOCSDIR%%/html/qquaternion-members.html +%%DOCSDIR%%/html/qquaternion.html %%DOCSDIR%%/html/qqueue-members.html %%DOCSDIR%%/html/qqueue.html %%DOCSDIR%%/html/qradialgradient-members.html @@ -3640,6 +4624,25 @@ %%DOCSDIR%%/html/qrubberband.html %%DOCSDIR%%/html/qrunnable-members.html %%DOCSDIR%%/html/qrunnable.html +%%DOCSDIR%%/html/qs60mainapplication-members.html +%%DOCSDIR%%/html/qs60mainapplication.html +%%DOCSDIR%%/html/qs60mainappui-members.html +%%DOCSDIR%%/html/qs60mainappui.html +%%DOCSDIR%%/html/qs60maindocument-members.html +%%DOCSDIR%%/html/qs60maindocument.html +%%DOCSDIR%%/html/qs60style-members.html +%%DOCSDIR%%/html/qs60style.html +%%DOCSDIR%%/html/qscopedpointer-members.html +%%DOCSDIR%%/html/qscopedpointer.html +%%DOCSDIR%%/html/qscreen-members.html +%%DOCSDIR%%/html/qscreen-qt3.html +%%DOCSDIR%%/html/qscreen.html +%%DOCSDIR%%/html/qscreencursor-members.html +%%DOCSDIR%%/html/qscreencursor.html +%%DOCSDIR%%/html/qscreendriverfactory-members.html +%%DOCSDIR%%/html/qscreendriverfactory.html +%%DOCSDIR%%/html/qscreendriverplugin-members.html +%%DOCSDIR%%/html/qscreendriverplugin.html %%DOCSDIR%%/html/qscriptable-members.html %%DOCSDIR%%/html/qscriptable.html %%DOCSDIR%%/html/qscriptclass-members.html @@ -3675,6 +4678,8 @@ %%DOCSDIR%%/html/qscrollbar.html %%DOCSDIR%%/html/qsemaphore-members.html %%DOCSDIR%%/html/qsemaphore.html +%%DOCSDIR%%/html/qsequentialanimationgroup-members.html +%%DOCSDIR%%/html/qsequentialanimationgroup.html %%DOCSDIR%%/html/qsessionmanager-members.html %%DOCSDIR%%/html/qsessionmanager.html %%DOCSDIR%%/html/qset-const-iterator-members.html @@ -3708,6 +4713,8 @@ %%DOCSDIR%%/html/qsignalmapper.html %%DOCSDIR%%/html/qsignalspy-members.html %%DOCSDIR%%/html/qsignalspy.html +%%DOCSDIR%%/html/qsignaltransition-members.html +%%DOCSDIR%%/html/qsignaltransition.html %%DOCSDIR%%/html/qsimplexmlnodemodel-members.html %%DOCSDIR%%/html/qsimplexmlnodemodel.html %%DOCSDIR%%/html/qsize-members.html @@ -3753,7 +4760,6 @@ %%DOCSDIR%%/html/qsqldatabase-members.html %%DOCSDIR%%/html/qsqldatabase-qt3.html %%DOCSDIR%%/html/qsqldatabase.html -%%DOCSDIR%%/html/qsqldatatype-table.html %%DOCSDIR%%/html/qsqldriver-members.html %%DOCSDIR%%/html/qsqldriver-qt3.html %%DOCSDIR%%/html/qsqldriver.html @@ -3814,6 +4820,14 @@ %%DOCSDIR%%/html/qstandarditemeditorcreator.html %%DOCSDIR%%/html/qstandarditemmodel-members.html %%DOCSDIR%%/html/qstandarditemmodel.html +%%DOCSDIR%%/html/qstate-members.html +%%DOCSDIR%%/html/qstate.html +%%DOCSDIR%%/html/qstatemachine-members.html +%%DOCSDIR%%/html/qstatemachine-signalevent-members.html +%%DOCSDIR%%/html/qstatemachine-signalevent.html +%%DOCSDIR%%/html/qstatemachine-wrappedevent-members.html +%%DOCSDIR%%/html/qstatemachine-wrappedevent.html +%%DOCSDIR%%/html/qstatemachine.html %%DOCSDIR%%/html/qstatusbar-members.html %%DOCSDIR%%/html/qstatusbar-qt3.html %%DOCSDIR%%/html/qstatusbar.html @@ -3865,6 +4879,7 @@ %%DOCSDIR%%/html/qstyleoptionframev3-members.html %%DOCSDIR%%/html/qstyleoptionframev3.html %%DOCSDIR%%/html/qstyleoptiongraphicsitem-members.html +%%DOCSDIR%%/html/qstyleoptiongraphicsitem-obsolete.html %%DOCSDIR%%/html/qstyleoptiongraphicsitem.html %%DOCSDIR%%/html/qstyleoptiongroupbox-members.html %%DOCSDIR%%/html/qstyleoptiongroupbox.html @@ -3902,6 +4917,8 @@ %%DOCSDIR%%/html/qstyleoptiontabv3.html %%DOCSDIR%%/html/qstyleoptiontabwidgetframe-members.html %%DOCSDIR%%/html/qstyleoptiontabwidgetframe.html +%%DOCSDIR%%/html/qstyleoptiontabwidgetframev2-members.html +%%DOCSDIR%%/html/qstyleoptiontabwidgetframev2.html %%DOCSDIR%%/html/qstyleoptiontitlebar-members.html %%DOCSDIR%%/html/qstyleoptiontitlebar.html %%DOCSDIR%%/html/qstyleoptiontoolbar-members.html @@ -3930,6 +4947,10 @@ %%DOCSDIR%%/html/qsvgrenderer.html %%DOCSDIR%%/html/qsvgwidget-members.html %%DOCSDIR%%/html/qsvgwidget.html +%%DOCSDIR%%/html/qswipegesture-members.html +%%DOCSDIR%%/html/qswipegesture.html +%%DOCSDIR%%/html/qsymbianevent-members.html +%%DOCSDIR%%/html/qsymbianevent.html %%DOCSDIR%%/html/qsyntaxhighlighter-members.html %%DOCSDIR%%/html/qsyntaxhighlighter.html %%DOCSDIR%%/html/qsysinfo-members.html @@ -3951,9 +4972,9 @@ %%DOCSDIR%%/html/qt-embedded-envvars.html %%DOCSDIR%%/html/qt-embedded-fonts.html %%DOCSDIR%%/html/qt-embedded-install.html +%%DOCSDIR%%/html/qt-embedded-kmap2qmap.html %%DOCSDIR%%/html/qt-embedded-linux.html %%DOCSDIR%%/html/qt-embedded-makeqpf.html -%%DOCSDIR%%/html/qt-embedded-opengl.html %%DOCSDIR%%/html/qt-embedded-pointer.html %%DOCSDIR%%/html/qt-embedded-porting-device.html %%DOCSDIR%%/html/qt-embedded-porting-operatingsystem.html @@ -3961,16 +4982,22 @@ %%DOCSDIR%%/html/qt-embedded-testingframebuffer.html %%DOCSDIR%%/html/qt-embedded-vnc.html %%DOCSDIR%%/html/qt-embedded.html +%%DOCSDIR%%/html/qt-embeddedlinux-accel.html +%%DOCSDIR%%/html/qt-embeddedlinux-directfb.html +%%DOCSDIR%%/html/qt-embeddedlinux-opengl.html +%%DOCSDIR%%/html/qt-embeddedlinux-openvg.html +%%DOCSDIR%%/html/qt-embeddedwince-accel.html %%DOCSDIR%%/html/qt-mac-cocoa-licensing.html %%DOCSDIR%%/html/qt-performance.html %%DOCSDIR%%/html/qt-qt3.html +%%DOCSDIR%%/html/qt-resources.html %%DOCSDIR%%/html/qt.dcf %%DOCSDIR%%/html/qt.html %%DOCSDIR%%/html/qt.tags %%DOCSDIR%%/html/qt3support.html %%DOCSDIR%%/html/qt3to4-treewalker.html %%DOCSDIR%%/html/qt3to4.html -%%DOCSDIR%%/html/qt4-5-intro.html +%%DOCSDIR%%/html/qt4-6-intro.html %%DOCSDIR%%/html/qt4-accessibility.html %%DOCSDIR%%/html/qt4-arthur.html %%DOCSDIR%%/html/qt4-designer.html @@ -4003,6 +5030,10 @@ %%DOCSDIR%%/html/qtabwidget-qt3.html %%DOCSDIR%%/html/qtabwidget.html %%DOCSDIR%%/html/qtalgorithms.html +%%DOCSDIR%%/html/qtapandholdgesture-members.html +%%DOCSDIR%%/html/qtapandholdgesture.html +%%DOCSDIR%%/html/qtapgesture-members.html +%%DOCSDIR%%/html/qtapgesture.html %%DOCSDIR%%/html/qtassistant.html %%DOCSDIR%%/html/qtce.html %%DOCSDIR%%/html/qtconcurrent-exception-members.html @@ -4038,12 +5069,13 @@ %%DOCSDIR%%/html/qtcpsocket.html %%DOCSDIR%%/html/qtdbus.html %%DOCSDIR%%/html/qtdemo.html +%%DOCSDIR%%/html/qtdesigner-components.html %%DOCSDIR%%/html/qtdesigner.html %%DOCSDIR%%/html/qtemporaryfile-members.html %%DOCSDIR%%/html/qtemporaryfile.html %%DOCSDIR%%/html/qtendian.html -%%DOCSDIR%%/html/qtest-qbenchmarkiterationcontroller-members.html -%%DOCSDIR%%/html/qtest-qbenchmarkiterationcontroller.html +%%DOCSDIR%%/html/qtest-qtoucheventsequence-members.html +%%DOCSDIR%%/html/qtest-qtoucheventsequence.html %%DOCSDIR%%/html/qtest.html %%DOCSDIR%%/html/qtesteventlist-members.html %%DOCSDIR%%/html/qtesteventlist.html @@ -4105,6 +5137,7 @@ %%DOCSDIR%%/html/qtextedit-qt3.html %%DOCSDIR%%/html/qtextedit.html %%DOCSDIR%%/html/qtextencoder-members.html +%%DOCSDIR%%/html/qtextencoder-qt3.html %%DOCSDIR%%/html/qtextencoder.html %%DOCSDIR%%/html/qtextformat-members.html %%DOCSDIR%%/html/qtextformat.html @@ -4162,6 +5195,7 @@ %%DOCSDIR%%/html/qtglobal-qt3.html %%DOCSDIR%%/html/qtglobal.html %%DOCSDIR%%/html/qtgui.html +%%DOCSDIR%%/html/qthelp-framework.html %%DOCSDIR%%/html/qthelp.html %%DOCSDIR%%/html/qthelpproject.html %%DOCSDIR%%/html/qthread-members.html @@ -4171,6 +5205,8 @@ %%DOCSDIR%%/html/qthreadpool.html %%DOCSDIR%%/html/qthreadstorage-members.html %%DOCSDIR%%/html/qthreadstorage.html +%%DOCSDIR%%/html/qtilerules-members.html +%%DOCSDIR%%/html/qtilerules.html %%DOCSDIR%%/html/qtime-members.html %%DOCSDIR%%/html/qtime-qt3.html %%DOCSDIR%%/html/qtime.html @@ -4185,6 +5221,7 @@ %%DOCSDIR%%/html/qtimerevent.html %%DOCSDIR%%/html/qtmac-as-native.html %%DOCSDIR%%/html/qtmain.html +%%DOCSDIR%%/html/qtmultimedia.html %%DOCSDIR%%/html/qtnetwork.html %%DOCSDIR%%/html/qtoolbar-members.html %%DOCSDIR%%/html/qtoolbar-qt3.html @@ -4199,9 +5236,15 @@ %%DOCSDIR%%/html/qtooltip-qt3.html %%DOCSDIR%%/html/qtooltip.html %%DOCSDIR%%/html/qtopengl.html +%%DOCSDIR%%/html/qtopenvg.html +%%DOCSDIR%%/html/qtouchevent-members.html +%%DOCSDIR%%/html/qtouchevent-touchpoint-members.html +%%DOCSDIR%%/html/qtouchevent-touchpoint.html +%%DOCSDIR%%/html/qtouchevent.html %%DOCSDIR%%/html/qtplugin-obsolete.html %%DOCSDIR%%/html/qtplugin.html %%DOCSDIR%%/html/qtransform-members.html +%%DOCSDIR%%/html/qtransform-obsolete.html %%DOCSDIR%%/html/qtransform.html %%DOCSDIR%%/html/qtranslator-members.html %%DOCSDIR%%/html/qtranslator-qt3.html @@ -4223,6 +5266,7 @@ %%DOCSDIR%%/html/qtscripttools.html %%DOCSDIR%%/html/qtsql.html %%DOCSDIR%%/html/qtsvg.html +%%DOCSDIR%%/html/qtsymbian.html %%DOCSDIR%%/html/qttest.html %%DOCSDIR%%/html/qttools.html %%DOCSDIR%%/html/qtuitools.html @@ -4256,6 +5300,8 @@ %%DOCSDIR%%/html/qvariant-members.html %%DOCSDIR%%/html/qvariant-qt3.html %%DOCSDIR%%/html/qvariant.html +%%DOCSDIR%%/html/qvariantanimation-members.html +%%DOCSDIR%%/html/qvariantanimation.html %%DOCSDIR%%/html/qvarlengtharray-members.html %%DOCSDIR%%/html/qvarlengtharray.html %%DOCSDIR%%/html/qvboxlayout-members.html @@ -4263,15 +5309,33 @@ %%DOCSDIR%%/html/qvboxlayout.html %%DOCSDIR%%/html/qvector-members.html %%DOCSDIR%%/html/qvector.html +%%DOCSDIR%%/html/qvector2d-members.html +%%DOCSDIR%%/html/qvector2d.html +%%DOCSDIR%%/html/qvector3d-members.html +%%DOCSDIR%%/html/qvector3d.html +%%DOCSDIR%%/html/qvector4d-members.html +%%DOCSDIR%%/html/qvector4d.html %%DOCSDIR%%/html/qvectoriterator-members.html %%DOCSDIR%%/html/qvectoriterator.html %%DOCSDIR%%/html/qvfb.html +%%DOCSDIR%%/html/qvideoframe-members.html +%%DOCSDIR%%/html/qvideoframe.html +%%DOCSDIR%%/html/qvideosurfaceformat-members.html +%%DOCSDIR%%/html/qvideosurfaceformat.html %%DOCSDIR%%/html/qwaitcondition-members.html %%DOCSDIR%%/html/qwaitcondition.html %%DOCSDIR%%/html/qweakpointer-members.html %%DOCSDIR%%/html/qweakpointer.html %%DOCSDIR%%/html/qwebdatabase-members.html %%DOCSDIR%%/html/qwebdatabase.html +%%DOCSDIR%%/html/qwebelement-members.html +%%DOCSDIR%%/html/qwebelement.html +%%DOCSDIR%%/html/qwebelementcollection-const-iterator-members.html +%%DOCSDIR%%/html/qwebelementcollection-const-iterator.html +%%DOCSDIR%%/html/qwebelementcollection-iterator-members.html +%%DOCSDIR%%/html/qwebelementcollection-iterator.html +%%DOCSDIR%%/html/qwebelementcollection-members.html +%%DOCSDIR%%/html/qwebelementcollection.html %%DOCSDIR%%/html/qwebframe-members.html %%DOCSDIR%%/html/qwebframe-obsolete.html %%DOCSDIR%%/html/qwebframe.html @@ -4283,10 +5347,16 @@ %%DOCSDIR%%/html/qwebhistoryitem.html %%DOCSDIR%%/html/qwebhittestresult-members.html %%DOCSDIR%%/html/qwebhittestresult.html +%%DOCSDIR%%/html/qwebinspector-members.html +%%DOCSDIR%%/html/qwebinspector.html %%DOCSDIR%%/html/qwebpage-choosemultiplefilesextensionoption-members.html %%DOCSDIR%%/html/qwebpage-choosemultiplefilesextensionoption.html %%DOCSDIR%%/html/qwebpage-choosemultiplefilesextensionreturn-members.html %%DOCSDIR%%/html/qwebpage-choosemultiplefilesextensionreturn.html +%%DOCSDIR%%/html/qwebpage-errorpageextensionoption-members.html +%%DOCSDIR%%/html/qwebpage-errorpageextensionoption.html +%%DOCSDIR%%/html/qwebpage-errorpageextensionreturn-members.html +%%DOCSDIR%%/html/qwebpage-errorpageextensionreturn.html %%DOCSDIR%%/html/qwebpage-extensionoption.html %%DOCSDIR%%/html/qwebpage-extensionreturn.html %%DOCSDIR%%/html/qwebpage-members.html @@ -4322,6 +5392,8 @@ %%DOCSDIR%%/html/qwidgetaction.html %%DOCSDIR%%/html/qwidgetitem-members.html %%DOCSDIR%%/html/qwidgetitem.html +%%DOCSDIR%%/html/qwindowsmime-members.html +%%DOCSDIR%%/html/qwindowsmime.html %%DOCSDIR%%/html/qwindowsstyle-members.html %%DOCSDIR%%/html/qwindowsstyle.html %%DOCSDIR%%/html/qwindowstatechangeevent-members.html @@ -4339,12 +5411,66 @@ %%DOCSDIR%%/html/qworkspace.html %%DOCSDIR%%/html/qwritelocker-members.html %%DOCSDIR%%/html/qwritelocker.html -%%DOCSDIR%%/html/qws-ahigl.html +%%DOCSDIR%%/html/qws-dbscreen-dbscreen-cpp.html +%%DOCSDIR%%/html/qws-dbscreen-dbscreen-h.html +%%DOCSDIR%%/html/qws-dbscreen-dbscreen-pro.html +%%DOCSDIR%%/html/qws-dbscreen-dbscreendriverplugin-cpp.html %%DOCSDIR%%/html/qws-dbscreen.html +%%DOCSDIR%%/html/qws-mousecalibration-calibration-cpp.html +%%DOCSDIR%%/html/qws-mousecalibration-calibration-h.html +%%DOCSDIR%%/html/qws-mousecalibration-main-cpp.html +%%DOCSDIR%%/html/qws-mousecalibration-mousecalibration-pro.html +%%DOCSDIR%%/html/qws-mousecalibration-scribblewidget-cpp.html +%%DOCSDIR%%/html/qws-mousecalibration-scribblewidget-h.html %%DOCSDIR%%/html/qws-mousecalibration.html +%%DOCSDIR%%/html/qws-simpledecoration-analogclock-cpp.html +%%DOCSDIR%%/html/qws-simpledecoration-analogclock-h.html +%%DOCSDIR%%/html/qws-simpledecoration-main-cpp.html +%%DOCSDIR%%/html/qws-simpledecoration-mydecoration-cpp.html +%%DOCSDIR%%/html/qws-simpledecoration-mydecoration-h.html +%%DOCSDIR%%/html/qws-simpledecoration-simpledecoration-pro.html %%DOCSDIR%%/html/qws-simpledecoration.html +%%DOCSDIR%%/html/qws-svgalib-svgalib-pro.html +%%DOCSDIR%%/html/qws-svgalib-svgalibpaintdevice-cpp.html +%%DOCSDIR%%/html/qws-svgalib-svgalibpaintdevice-h.html +%%DOCSDIR%%/html/qws-svgalib-svgalibpaintengine-cpp.html +%%DOCSDIR%%/html/qws-svgalib-svgalibpaintengine-h.html +%%DOCSDIR%%/html/qws-svgalib-svgalibplugin-cpp.html +%%DOCSDIR%%/html/qws-svgalib-svgalibscreen-cpp.html +%%DOCSDIR%%/html/qws-svgalib-svgalibscreen-h.html +%%DOCSDIR%%/html/qws-svgalib-svgalibsurface-cpp.html +%%DOCSDIR%%/html/qws-svgalib-svgalibsurface-h.html %%DOCSDIR%%/html/qws-svgalib.html %%DOCSDIR%%/html/qws.html +%%DOCSDIR%%/html/qwscalibratedmousehandler-members.html +%%DOCSDIR%%/html/qwscalibratedmousehandler.html +%%DOCSDIR%%/html/qwsclient-members.html +%%DOCSDIR%%/html/qwsclient.html +%%DOCSDIR%%/html/qwsembedwidget-members.html +%%DOCSDIR%%/html/qwsembedwidget.html +%%DOCSDIR%%/html/qwsevent-members.html +%%DOCSDIR%%/html/qwsevent.html +%%DOCSDIR%%/html/qwsglwindowsurface-members.html +%%DOCSDIR%%/html/qwsglwindowsurface.html +%%DOCSDIR%%/html/qwsinputmethod-members.html +%%DOCSDIR%%/html/qwsinputmethod-obsolete.html +%%DOCSDIR%%/html/qwsinputmethod.html +%%DOCSDIR%%/html/qwskeyboardhandler-members.html +%%DOCSDIR%%/html/qwskeyboardhandler.html +%%DOCSDIR%%/html/qwsmousehandler-members.html +%%DOCSDIR%%/html/qwsmousehandler.html +%%DOCSDIR%%/html/qwspointercalibrationdata-members.html +%%DOCSDIR%%/html/qwspointercalibrationdata.html +%%DOCSDIR%%/html/qwsscreensaver-members.html +%%DOCSDIR%%/html/qwsscreensaver.html +%%DOCSDIR%%/html/qwsserver-keyboardfilter-members.html +%%DOCSDIR%%/html/qwsserver-keyboardfilter.html +%%DOCSDIR%%/html/qwsserver-members.html +%%DOCSDIR%%/html/qwsserver-obsolete.html +%%DOCSDIR%%/html/qwsserver-qt3.html +%%DOCSDIR%%/html/qwsserver.html +%%DOCSDIR%%/html/qwswindow-members.html +%%DOCSDIR%%/html/qwswindow.html %%DOCSDIR%%/html/qx11embedcontainer-members.html %%DOCSDIR%%/html/qx11embedcontainer.html %%DOCSDIR%%/html/qx11embedwidget-members.html @@ -4393,6 +5519,10 @@ %%DOCSDIR%%/html/qxmlreader.html %%DOCSDIR%%/html/qxmlresultitems-members.html %%DOCSDIR%%/html/qxmlresultitems.html +%%DOCSDIR%%/html/qxmlschema-members.html +%%DOCSDIR%%/html/qxmlschema.html +%%DOCSDIR%%/html/qxmlschemavalidator-members.html +%%DOCSDIR%%/html/qxmlschemavalidator.html %%DOCSDIR%%/html/qxmlserializer-members.html %%DOCSDIR%%/html/qxmlserializer.html %%DOCSDIR%%/html/qxmlsimplereader-members.html @@ -4416,11 +5546,13 @@ %%DOCSDIR%%/html/rcc.html %%DOCSDIR%%/html/requirements-embedded-linux.html %%DOCSDIR%%/html/requirements-mac.html +%%DOCSDIR%%/html/requirements-symbian.html %%DOCSDIR%%/html/requirements-win.html %%DOCSDIR%%/html/requirements-wince.html %%DOCSDIR%%/html/requirements-x11.html %%DOCSDIR%%/html/requirements.html %%DOCSDIR%%/html/resources.html +%%DOCSDIR%%/html/restoring-geometry.html %%DOCSDIR%%/html/richtext-advanced-processing.html %%DOCSDIR%%/html/richtext-calendar-calendar-pro.html %%DOCSDIR%%/html/richtext-calendar-main-cpp.html @@ -4430,6 +5562,7 @@ %%DOCSDIR%%/html/richtext-common-tasks.html %%DOCSDIR%%/html/richtext-cursor.html %%DOCSDIR%%/html/richtext-html-subset.html +%%DOCSDIR%%/html/richtext-layouts.html %%DOCSDIR%%/html/richtext-orderform-detailsdialog-cpp.html %%DOCSDIR%%/html/richtext-orderform-detailsdialog-h.html %%DOCSDIR%%/html/richtext-orderform-main-cpp.html @@ -4437,6 +5570,7 @@ %%DOCSDIR%%/html/richtext-orderform-mainwindow-h.html %%DOCSDIR%%/html/richtext-orderform-orderform-pro.html %%DOCSDIR%%/html/richtext-orderform.html +%%DOCSDIR%%/html/richtext-processing.html %%DOCSDIR%%/html/richtext-structure.html %%DOCSDIR%%/html/richtext-syntaxhighlighter-highlighter-cpp.html %%DOCSDIR%%/html/richtext-syntaxhighlighter-highlighter-h.html @@ -4507,6 +5641,7 @@ %%DOCSDIR%%/html/script-defaultprototypes-prototypes-cpp.html %%DOCSDIR%%/html/script-defaultprototypes-prototypes-h.html %%DOCSDIR%%/html/script-defaultprototypes.html +%%DOCSDIR%%/html/script-helloscript-helloscript-js.html %%DOCSDIR%%/html/script-helloscript-helloscript-pro.html %%DOCSDIR%%/html/script-helloscript-helloscript-qrc.html %%DOCSDIR%%/html/script-helloscript-main-cpp.html @@ -4523,7 +5658,6 @@ %%DOCSDIR%%/html/script-qstetrix.html %%DOCSDIR%%/html/script.html %%DOCSDIR%%/html/scripting.html -%%DOCSDIR%%/html/scripttools.html %%DOCSDIR%%/html/session.html %%DOCSDIR%%/html/shadow-builds-wince.html %%DOCSDIR%%/html/shared.html @@ -4534,10 +5668,17 @@ %%DOCSDIR%%/html/sql-cachedtable-tableeditor-cpp.html %%DOCSDIR%%/html/sql-cachedtable-tableeditor-h.html %%DOCSDIR%%/html/sql-cachedtable.html +%%DOCSDIR%%/html/sql-connecting.html %%DOCSDIR%%/html/sql-drilldown-drilldown-pro.html %%DOCSDIR%%/html/sql-drilldown-drilldown-qrc.html %%DOCSDIR%%/html/sql-drilldown-imageitem-cpp.html %%DOCSDIR%%/html/sql-drilldown-imageitem-h.html +%%DOCSDIR%%/html/sql-drilldown-images-beijing-png.html +%%DOCSDIR%%/html/sql-drilldown-images-berlin-png.html +%%DOCSDIR%%/html/sql-drilldown-images-brisbane-png.html +%%DOCSDIR%%/html/sql-drilldown-images-munich-png.html +%%DOCSDIR%%/html/sql-drilldown-images-oslo-png.html +%%DOCSDIR%%/html/sql-drilldown-images-redwood-png.html %%DOCSDIR%%/html/sql-drilldown-informationwindow-cpp.html %%DOCSDIR%%/html/sql-drilldown-informationwindow-h.html %%DOCSDIR%%/html/sql-drilldown-main-cpp.html @@ -4545,16 +5686,22 @@ %%DOCSDIR%%/html/sql-drilldown-view-h.html %%DOCSDIR%%/html/sql-drilldown.html %%DOCSDIR%%/html/sql-driver.html +%%DOCSDIR%%/html/sql-forms.html %%DOCSDIR%%/html/sql-masterdetail-albumdetails-xml.html %%DOCSDIR%%/html/sql-masterdetail-database-h.html %%DOCSDIR%%/html/sql-masterdetail-dialog-cpp.html %%DOCSDIR%%/html/sql-masterdetail-dialog-h.html +%%DOCSDIR%%/html/sql-masterdetail-images-icon-png.html +%%DOCSDIR%%/html/sql-masterdetail-images-image-png.html %%DOCSDIR%%/html/sql-masterdetail-main-cpp.html %%DOCSDIR%%/html/sql-masterdetail-mainwindow-cpp.html %%DOCSDIR%%/html/sql-masterdetail-mainwindow-h.html %%DOCSDIR%%/html/sql-masterdetail-masterdetail-pro.html %%DOCSDIR%%/html/sql-masterdetail-masterdetail-qrc.html %%DOCSDIR%%/html/sql-masterdetail.html +%%DOCSDIR%%/html/sql-model.html +%%DOCSDIR%%/html/sql-presenting.html +%%DOCSDIR%%/html/sql-programming.html %%DOCSDIR%%/html/sql-querymodel-customsqlmodel-cpp.html %%DOCSDIR%%/html/sql-querymodel-customsqlmodel-h.html %%DOCSDIR%%/html/sql-querymodel-editablesqlmodel-cpp.html @@ -4565,6 +5712,7 @@ %%DOCSDIR%%/html/sql-relationaltablemodel-relationaltablemodel-cpp.html %%DOCSDIR%%/html/sql-relationaltablemodel-relationaltablemodel-pro.html %%DOCSDIR%%/html/sql-relationaltablemodel.html +%%DOCSDIR%%/html/sql-sqlstatements.html %%DOCSDIR%%/html/sql-sqlwidgetmapper-main-cpp.html %%DOCSDIR%%/html/sql-sqlwidgetmapper-sqlwidgetmapper-pro.html %%DOCSDIR%%/html/sql-sqlwidgetmapper-window-cpp.html @@ -4573,7 +5721,33 @@ %%DOCSDIR%%/html/sql-tablemodel-tablemodel-cpp.html %%DOCSDIR%%/html/sql-tablemodel-tablemodel-pro.html %%DOCSDIR%%/html/sql-tablemodel.html +%%DOCSDIR%%/html/sql-types.html %%DOCSDIR%%/html/ssl.html +%%DOCSDIR%%/html/standard-dialogs.html +%%DOCSDIR%%/html/statemachine-api.html +%%DOCSDIR%%/html/statemachine-eventtransitions-eventtransitions-pro.html +%%DOCSDIR%%/html/statemachine-eventtransitions-main-cpp.html +%%DOCSDIR%%/html/statemachine-eventtransitions.html +%%DOCSDIR%%/html/statemachine-factorial-factorial-pro.html +%%DOCSDIR%%/html/statemachine-factorial-main-cpp.html +%%DOCSDIR%%/html/statemachine-factorial.html +%%DOCSDIR%%/html/statemachine-pingpong-main-cpp.html +%%DOCSDIR%%/html/statemachine-pingpong-pingpong-pro.html +%%DOCSDIR%%/html/statemachine-pingpong.html +%%DOCSDIR%%/html/statemachine-rogue-main-cpp.html +%%DOCSDIR%%/html/statemachine-rogue-movementtransition-h.html +%%DOCSDIR%%/html/statemachine-rogue-rogue-pro.html +%%DOCSDIR%%/html/statemachine-rogue-window-cpp.html +%%DOCSDIR%%/html/statemachine-rogue-window-h.html +%%DOCSDIR%%/html/statemachine-rogue.html +%%DOCSDIR%%/html/statemachine-trafficlight-main-cpp.html +%%DOCSDIR%%/html/statemachine-trafficlight-trafficlight-pro.html +%%DOCSDIR%%/html/statemachine-trafficlight.html +%%DOCSDIR%%/html/statemachine-twowaybutton-main-cpp.html +%%DOCSDIR%%/html/statemachine-twowaybutton-twowaybutton-pro.html +%%DOCSDIR%%/html/statemachine-twowaybutton.html +%%DOCSDIR%%/html/statemachine.html +%%DOCSDIR%%/html/string-processing.html %%DOCSDIR%%/html/style-reference.html %%DOCSDIR%%/html/stylesheet-customizing.html %%DOCSDIR%%/html/stylesheet-designer.html @@ -4582,11 +5756,10 @@ %%DOCSDIR%%/html/stylesheet-syntax.html %%DOCSDIR%%/html/stylesheet.html %%DOCSDIR%%/html/supported-platforms.html +%%DOCSDIR%%/html/symbian-with-qt-introduction.html +%%DOCSDIR%%/html/symbianexceptionsafety.html %%DOCSDIR%%/html/templates.html -%%DOCSDIR%%/html/text-processing.html -%%DOCSDIR%%/html/text.html %%DOCSDIR%%/html/thread.html -%%DOCSDIR%%/html/threading.html %%DOCSDIR%%/html/threads-mandelbrot-main-cpp.html %%DOCSDIR%%/html/threads-mandelbrot-mandelbrot-pro.html %%DOCSDIR%%/html/threads-mandelbrot-mandelbrotwidget-cpp.html @@ -4594,6 +5767,9 @@ %%DOCSDIR%%/html/threads-mandelbrot-renderthread-cpp.html %%DOCSDIR%%/html/threads-mandelbrot-renderthread-h.html %%DOCSDIR%%/html/threads-mandelbrot.html +%%DOCSDIR%%/html/threads-modules.html +%%DOCSDIR%%/html/threads-qobject.html +%%DOCSDIR%%/html/threads-qtconcurrent.html %%DOCSDIR%%/html/threads-queuedcustomtype-block-cpp.html %%DOCSDIR%%/html/threads-queuedcustomtype-block-h.html %%DOCSDIR%%/html/threads-queuedcustomtype-main-cpp.html @@ -4603,14 +5779,16 @@ %%DOCSDIR%%/html/threads-queuedcustomtype-window-cpp.html %%DOCSDIR%%/html/threads-queuedcustomtype-window-h.html %%DOCSDIR%%/html/threads-queuedcustomtype.html +%%DOCSDIR%%/html/threads-reentrancy.html %%DOCSDIR%%/html/threads-semaphores-semaphores-cpp.html %%DOCSDIR%%/html/threads-semaphores-semaphores-pro.html %%DOCSDIR%%/html/threads-semaphores.html +%%DOCSDIR%%/html/threads-starting.html +%%DOCSDIR%%/html/threads-synchronizing.html %%DOCSDIR%%/html/threads-waitconditions-waitconditions-cpp.html %%DOCSDIR%%/html/threads-waitconditions-waitconditions-pro.html %%DOCSDIR%%/html/threads-waitconditions.html %%DOCSDIR%%/html/threads.html -%%DOCSDIR%%/html/time.html %%DOCSDIR%%/html/timers.html %%DOCSDIR%%/html/tools-codecs-codecs-pro.html %%DOCSDIR%%/html/tools-codecs-main-cpp.html @@ -4627,6 +5805,11 @@ %%DOCSDIR%%/html/tools-completer-mainwindow-cpp.html %%DOCSDIR%%/html/tools-completer-mainwindow-h.html %%DOCSDIR%%/html/tools-completer.html +%%DOCSDIR%%/html/tools-contiguouscache-contiguouscache-pro.html +%%DOCSDIR%%/html/tools-contiguouscache-main-cpp.html +%%DOCSDIR%%/html/tools-contiguouscache-randomlistmodel-cpp.html +%%DOCSDIR%%/html/tools-contiguouscache-randomlistmodel-h.html +%%DOCSDIR%%/html/tools-contiguouscache.html %%DOCSDIR%%/html/tools-customcompleter-customcompleter-pro.html %%DOCSDIR%%/html/tools-customcompleter-customcompleter-qrc.html %%DOCSDIR%%/html/tools-customcompleter-main-cpp.html @@ -4665,6 +5848,15 @@ %%DOCSDIR%%/html/tools-i18n-mainwindow-cpp.html %%DOCSDIR%%/html/tools-i18n-mainwindow-h.html %%DOCSDIR%%/html/tools-i18n.html +%%DOCSDIR%%/html/tools-inputpanel-inputpanel-pro.html +%%DOCSDIR%%/html/tools-inputpanel-main-cpp.html +%%DOCSDIR%%/html/tools-inputpanel-mainform-ui.html +%%DOCSDIR%%/html/tools-inputpanel-myinputpanel-cpp.html +%%DOCSDIR%%/html/tools-inputpanel-myinputpanel-h.html +%%DOCSDIR%%/html/tools-inputpanel-myinputpanelcontext-cpp.html +%%DOCSDIR%%/html/tools-inputpanel-myinputpanelcontext-h.html +%%DOCSDIR%%/html/tools-inputpanel-myinputpanelform-ui.html +%%DOCSDIR%%/html/tools-inputpanel.html %%DOCSDIR%%/html/tools-plugandpaint-interfaces-h.html %%DOCSDIR%%/html/tools-plugandpaint-main-cpp.html %%DOCSDIR%%/html/tools-plugandpaint-mainwindow-cpp.html @@ -4724,6 +5916,7 @@ %%DOCSDIR%%/html/tools-undoframework-diagramitem-h.html %%DOCSDIR%%/html/tools-undoframework-diagramscene-cpp.html %%DOCSDIR%%/html/tools-undoframework-diagramscene-h.html +%%DOCSDIR%%/html/tools-undoframework-images-cross-png.html %%DOCSDIR%%/html/tools-undoframework-main-cpp.html %%DOCSDIR%%/html/tools-undoframework-mainwindow-cpp.html %%DOCSDIR%%/html/tools-undoframework-mainwindow-h.html @@ -4731,7 +5924,6 @@ %%DOCSDIR%%/html/tools-undoframework-undoframework-qrc.html %%DOCSDIR%%/html/tools-undoframework.html %%DOCSDIR%%/html/tools.html -%%DOCSDIR%%/html/topics.html %%DOCSDIR%%/html/trademarks.html %%DOCSDIR%%/html/tutorials-addressbook-fr-part1-addressbook-cpp.html %%DOCSDIR%%/html/tutorials-addressbook-fr-part1-addressbook-h.html @@ -4817,6 +6009,18 @@ %%DOCSDIR%%/html/tutorials-addressbook-part7-part7-pro.html %%DOCSDIR%%/html/tutorials-addressbook-part7.html %%DOCSDIR%%/html/tutorials-addressbook.html +%%DOCSDIR%%/html/tutorials-widgets-childwidget-childwidget-pro.html +%%DOCSDIR%%/html/tutorials-widgets-childwidget-main-cpp.html +%%DOCSDIR%%/html/tutorials-widgets-childwidget.html +%%DOCSDIR%%/html/tutorials-widgets-nestedlayouts-main-cpp.html +%%DOCSDIR%%/html/tutorials-widgets-nestedlayouts-nestedlayouts-pro.html +%%DOCSDIR%%/html/tutorials-widgets-nestedlayouts.html +%%DOCSDIR%%/html/tutorials-widgets-toplevel-main-cpp.html +%%DOCSDIR%%/html/tutorials-widgets-toplevel-toplevel-pro.html +%%DOCSDIR%%/html/tutorials-widgets-toplevel.html +%%DOCSDIR%%/html/tutorials-widgets-windowlayout-main-cpp.html +%%DOCSDIR%%/html/tutorials-widgets-windowlayout-windowlayout-pro.html +%%DOCSDIR%%/html/tutorials-widgets-windowlayout.html %%DOCSDIR%%/html/tutorials.html %%DOCSDIR%%/html/uic.html %%DOCSDIR%%/html/uitools-multipleinheritance-calculatorform-cpp.html @@ -4835,6 +6039,13 @@ %%DOCSDIR%%/html/unicode.html %%DOCSDIR%%/html/unix-signals.html %%DOCSDIR%%/html/usingadaptors.html +%%DOCSDIR%%/html/webintegration.html +%%DOCSDIR%%/html/webkit-domtraversal-domtraversal-pro.html +%%DOCSDIR%%/html/webkit-domtraversal-main-cpp.html +%%DOCSDIR%%/html/webkit-domtraversal-window-cpp.html +%%DOCSDIR%%/html/webkit-domtraversal-window-h.html +%%DOCSDIR%%/html/webkit-domtraversal-window-ui.html +%%DOCSDIR%%/html/webkit-domtraversal.html %%DOCSDIR%%/html/webkit-fancybrowser-fancybrowser-pro.html %%DOCSDIR%%/html/webkit-fancybrowser-jquery-min-js.html %%DOCSDIR%%/html/webkit-fancybrowser-jquery-qrc.html @@ -4865,11 +6076,19 @@ %%DOCSDIR%%/html/webkit-previewer-previewer-pro.html %%DOCSDIR%%/html/webkit-previewer-previewer-ui.html %%DOCSDIR%%/html/webkit-previewer.html +%%DOCSDIR%%/html/webkit-simpleselector-main-cpp.html +%%DOCSDIR%%/html/webkit-simpleselector-simpleselector-pro.html +%%DOCSDIR%%/html/webkit-simpleselector-window-cpp.html +%%DOCSDIR%%/html/webkit-simpleselector-window-h.html +%%DOCSDIR%%/html/webkit-simpleselector-window-ui.html +%%DOCSDIR%%/html/webkit-simpleselector.html +%%DOCSDIR%%/html/widget-classes.html %%DOCSDIR%%/html/widgets-analogclock-analogclock-cpp.html %%DOCSDIR%%/html/widgets-analogclock-analogclock-h.html %%DOCSDIR%%/html/widgets-analogclock-analogclock-pro.html %%DOCSDIR%%/html/widgets-analogclock-main-cpp.html %%DOCSDIR%%/html/widgets-analogclock.html +%%DOCSDIR%%/html/widgets-and-layouts.html %%DOCSDIR%%/html/widgets-calculator-button-cpp.html %%DOCSDIR%%/html/widgets-calculator-button-h.html %%DOCSDIR%%/html/widgets-calculator-calculator-cpp.html @@ -4911,6 +6130,20 @@ %%DOCSDIR%%/html/widgets-icons-iconsizespinbox-h.html %%DOCSDIR%%/html/widgets-icons-imagedelegate-cpp.html %%DOCSDIR%%/html/widgets-icons-imagedelegate-h.html +%%DOCSDIR%%/html/widgets-icons-images-designer-png.html +%%DOCSDIR%%/html/widgets-icons-images-find-disabled-png.html +%%DOCSDIR%%/html/widgets-icons-images-find-normal-png.html +%%DOCSDIR%%/html/widgets-icons-images-monkey-off-128x128-png.html +%%DOCSDIR%%/html/widgets-icons-images-monkey-off-16x16-png.html +%%DOCSDIR%%/html/widgets-icons-images-monkey-off-32x32-png.html +%%DOCSDIR%%/html/widgets-icons-images-monkey-off-64x64-png.html +%%DOCSDIR%%/html/widgets-icons-images-monkey-on-128x128-png.html +%%DOCSDIR%%/html/widgets-icons-images-monkey-on-16x16-png.html +%%DOCSDIR%%/html/widgets-icons-images-monkey-on-32x32-png.html +%%DOCSDIR%%/html/widgets-icons-images-monkey-on-64x64-png.html +%%DOCSDIR%%/html/widgets-icons-images-qt-extended-16x16-png.html +%%DOCSDIR%%/html/widgets-icons-images-qt-extended-32x32-png.html +%%DOCSDIR%%/html/widgets-icons-images-qt-extended-48x48-png.html %%DOCSDIR%%/html/widgets-icons-main-cpp.html %%DOCSDIR%%/html/widgets-icons-mainwindow-cpp.html %%DOCSDIR%%/html/widgets-icons-mainwindow-h.html @@ -4954,6 +6187,8 @@ %%DOCSDIR%%/html/widgets-spinboxes-window-cpp.html %%DOCSDIR%%/html/widgets-spinboxes-window-h.html %%DOCSDIR%%/html/widgets-spinboxes.html +%%DOCSDIR%%/html/widgets-styles-images-woodbackground-png.html +%%DOCSDIR%%/html/widgets-styles-images-woodbutton-png.html %%DOCSDIR%%/html/widgets-styles-main-cpp.html %%DOCSDIR%%/html/widgets-styles-norwegianwoodstyle-cpp.html %%DOCSDIR%%/html/widgets-styles-norwegianwoodstyle-h.html @@ -4962,6 +6197,36 @@ %%DOCSDIR%%/html/widgets-styles-widgetgallery-cpp.html %%DOCSDIR%%/html/widgets-styles-widgetgallery-h.html %%DOCSDIR%%/html/widgets-styles.html +%%DOCSDIR%%/html/widgets-stylesheet-images-checkbox-checked-hover-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-checkbox-checked-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-checkbox-checked-pressed-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-checkbox-unchecked-hover-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-checkbox-unchecked-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-checkbox-unchecked-pressed-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-down-arrow-disabled-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-down-arrow-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-frame-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-pagefold-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-pushbutton-hover-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-pushbutton-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-pushbutton-pressed-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-radiobutton-checked-hover-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-radiobutton-checked-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-radiobutton-checked-pressed-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-radiobutton-unchecked-hover-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-radiobutton-unchecked-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-radiobutton-unchecked-pressed-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-sizegrip-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-spindown-hover-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-spindown-off-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-spindown-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-spindown-pressed-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-spinup-hover-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-spinup-off-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-spinup-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-spinup-pressed-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-up-arrow-disabled-png.html +%%DOCSDIR%%/html/widgets-stylesheet-images-up-arrow-png.html %%DOCSDIR%%/html/widgets-stylesheet-layouts-default-ui.html %%DOCSDIR%%/html/widgets-stylesheet-layouts-pagefold-ui.html %%DOCSDIR%%/html/widgets-stylesheet-main-cpp.html @@ -4992,6 +6257,9 @@ %%DOCSDIR%%/html/widgets-tetrix-tetrixwindow-cpp.html %%DOCSDIR%%/html/widgets-tetrix-tetrixwindow-h.html %%DOCSDIR%%/html/widgets-tetrix.html +%%DOCSDIR%%/html/widgets-tooltips-images-circle-png.html +%%DOCSDIR%%/html/widgets-tooltips-images-square-png.html +%%DOCSDIR%%/html/widgets-tooltips-images-triangle-png.html %%DOCSDIR%%/html/widgets-tooltips-main-cpp.html %%DOCSDIR%%/html/widgets-tooltips-shapeitem-cpp.html %%DOCSDIR%%/html/widgets-tooltips-shapeitem-h.html @@ -5018,7 +6286,11 @@ %%DOCSDIR%%/html/wince-with-qt-introduction.html %%DOCSDIR%%/html/windowsce-customization.html %%DOCSDIR%%/html/windowsce-opengl.html +%%DOCSDIR%%/html/windowsce-openvg.html +%%DOCSDIR%%/html/windowsce-signing.html %%DOCSDIR%%/html/winsystem.html +%%DOCSDIR%%/html/x11overlays.html +%%DOCSDIR%%/html/xml-dom-tml.html %%DOCSDIR%%/html/xml-dombookmarks-dombookmarks-pro.html %%DOCSDIR%%/html/xml-dombookmarks-main-cpp.html %%DOCSDIR%%/html/xml-dombookmarks-mainwindow-cpp.html @@ -5026,11 +6298,17 @@ %%DOCSDIR%%/html/xml-dombookmarks-xbeltree-cpp.html %%DOCSDIR%%/html/xml-dombookmarks-xbeltree-h.html %%DOCSDIR%%/html/xml-dombookmarks.html +%%DOCSDIR%%/html/xml-htmlinfo-htmlinfo-pro.html +%%DOCSDIR%%/html/xml-htmlinfo-main-cpp.html +%%DOCSDIR%%/html/xml-htmlinfo.html +%%DOCSDIR%%/html/xml-namespaces.html +%%DOCSDIR%%/html/xml-processing.html %%DOCSDIR%%/html/xml-rsslisting-main-cpp.html %%DOCSDIR%%/html/xml-rsslisting-rsslisting-cpp.html %%DOCSDIR%%/html/xml-rsslisting-rsslisting-h.html %%DOCSDIR%%/html/xml-rsslisting-rsslisting-pro.html %%DOCSDIR%%/html/xml-rsslisting.html +%%DOCSDIR%%/html/xml-sax.html %%DOCSDIR%%/html/xml-saxbookmarks-main-cpp.html %%DOCSDIR%%/html/xml-saxbookmarks-mainwindow-cpp.html %%DOCSDIR%%/html/xml-saxbookmarks-mainwindow-h.html @@ -5049,6 +6327,7 @@ %%DOCSDIR%%/html/xml-streambookmarks-xbelwriter-cpp.html %%DOCSDIR%%/html/xml-streambookmarks-xbelwriter-h.html %%DOCSDIR%%/html/xml-streambookmarks.html +%%DOCSDIR%%/html/xml-streaming.html %%DOCSDIR%%/html/xml-tools.html %%DOCSDIR%%/html/xml-xmlstreamlint-main-cpp.html %%DOCSDIR%%/html/xml-xmlstreamlint-xmlstreamlint-pro.html @@ -5088,6 +6367,19 @@ %%DOCSDIR%%/html/xmlpatterns-recipes-recipes-pro.html %%DOCSDIR%%/html/xmlpatterns-recipes-recipes-qrc.html %%DOCSDIR%%/html/xmlpatterns-recipes.html +%%DOCSDIR%%/html/xmlpatterns-schema-files-invalid-contact-xml.html +%%DOCSDIR%%/html/xmlpatterns-schema-files-invalid-order-xml.html +%%DOCSDIR%%/html/xmlpatterns-schema-files-invalid-recipe-xml.html +%%DOCSDIR%%/html/xmlpatterns-schema-files-valid-contact-xml.html +%%DOCSDIR%%/html/xmlpatterns-schema-files-valid-order-xml.html +%%DOCSDIR%%/html/xmlpatterns-schema-files-valid-recipe-xml.html +%%DOCSDIR%%/html/xmlpatterns-schema-main-cpp.html +%%DOCSDIR%%/html/xmlpatterns-schema-mainwindow-cpp.html +%%DOCSDIR%%/html/xmlpatterns-schema-mainwindow-h.html +%%DOCSDIR%%/html/xmlpatterns-schema-schema-pro.html +%%DOCSDIR%%/html/xmlpatterns-schema-schema-qrc.html +%%DOCSDIR%%/html/xmlpatterns-schema-schema-ui.html +%%DOCSDIR%%/html/xmlpatterns-schema.html %%DOCSDIR%%/html/xmlpatterns-trafficinfo-main-cpp.html %%DOCSDIR%%/html/xmlpatterns-trafficinfo-mainwindow-cpp.html %%DOCSDIR%%/html/xmlpatterns-trafficinfo-mainwindow-h.html @@ -5104,6 +6396,7 @@ %%DOCSDIR%%/html/xmlpatterns-xquery-globalvariables-globalvariables-pro.html %%DOCSDIR%%/html/xmlpatterns-xquery-globalvariables-reportglobals-xq.html %%DOCSDIR%%/html/xmlpatterns-xquery-globalvariables.html +%%DOCSDIR%%/html/xmlprocessing.html %%DOCSDIR%%/html/xquery-introduction.html %%DOCSDIR%%/qch/assistant.qch %%DOCSDIR%%/qch/designer.qch @@ -5111,6 +6404,89 @@ %%DOCSDIR%%/qch/qmake.qch %%DOCSDIR%%/qch/qt.qch @dirrm %%DOCSDIR%%/qch +@dirrm %%DOCSDIR%%/html/images/used-in-examples/widgets/tooltips/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/widgets/tooltips +@dirrm %%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/widgets/stylesheet +@dirrm %%DOCSDIR%%/html/images/used-in-examples/widgets/styles/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/widgets/styles +@dirrm %%DOCSDIR%%/html/images/used-in-examples/widgets/icons/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/widgets/icons +@dirrm %%DOCSDIR%%/html/images/used-in-examples/widgets +@dirrm %%DOCSDIR%%/html/images/used-in-examples/tools/undoframework/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/tools/undoframework +@dirrm %%DOCSDIR%%/html/images/used-in-examples/tools +@dirrm %%DOCSDIR%%/html/images/used-in-examples/sql/masterdetail/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/sql/masterdetail +@dirrm %%DOCSDIR%%/html/images/used-in-examples/sql/drilldown/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/sql/drilldown +@dirrm %%DOCSDIR%%/html/images/used-in-examples/sql +@dirrm %%DOCSDIR%%/html/images/used-in-examples/painting/imagecomposition/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/painting/imagecomposition +@dirrm %%DOCSDIR%%/html/images/used-in-examples/painting/basicdrawing/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/painting/basicdrawing +@dirrm %%DOCSDIR%%/html/images/used-in-examples/painting +@dirrm %%DOCSDIR%%/html/images/used-in-examples/opengl/textures/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/opengl/textures +@dirrm %%DOCSDIR%%/html/images/used-in-examples/opengl +@dirrm %%DOCSDIR%%/html/images/used-in-examples/network/qftp/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/network/qftp +@dirrm %%DOCSDIR%%/html/images/used-in-examples/network +@dirrm %%DOCSDIR%%/html/images/used-in-examples/mainwindows/sdi/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/mainwindows/sdi +@dirrm %%DOCSDIR%%/html/images/used-in-examples/mainwindows/mdi/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/mainwindows/mdi +@dirrm %%DOCSDIR%%/html/images/used-in-examples/mainwindows/dockwidgets/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/mainwindows/dockwidgets +@dirrm %%DOCSDIR%%/html/images/used-in-examples/mainwindows/application/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/mainwindows/application +@dirrm %%DOCSDIR%%/html/images/used-in-examples/mainwindows +@dirrm %%DOCSDIR%%/html/images/used-in-examples/itemviews/pixelator/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/itemviews/pixelator +@dirrm %%DOCSDIR%%/html/images/used-in-examples/itemviews +@dirrm %%DOCSDIR%%/html/images/used-in-examples/graphicsview/padnavigator/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/graphicsview/padnavigator +@dirrm %%DOCSDIR%%/html/images/used-in-examples/graphicsview/dragdroprobot/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/graphicsview/dragdroprobot +@dirrm %%DOCSDIR%%/html/images/used-in-examples/graphicsview/diagramscene/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/graphicsview/diagramscene +@dirrm %%DOCSDIR%%/html/images/used-in-examples/graphicsview/basicgraphicslayouts/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/graphicsview/basicgraphicslayouts +@dirrm %%DOCSDIR%%/html/images/used-in-examples/graphicsview +@dirrm %%DOCSDIR%%/html/images/used-in-examples/effects/blurpicker/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/effects/blurpicker +@dirrm %%DOCSDIR%%/html/images/used-in-examples/effects +@dirrm %%DOCSDIR%%/html/images/used-in-examples/draganddrop/draggableicons/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/draganddrop/draggableicons +@dirrm %%DOCSDIR%%/html/images/used-in-examples/draganddrop/delayedencoding/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/draganddrop/delayedencoding +@dirrm %%DOCSDIR%%/html/images/used-in-examples/draganddrop +@dirrm %%DOCSDIR%%/html/images/used-in-examples/dialogs/licensewizard/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/dialogs/licensewizard +@dirrm %%DOCSDIR%%/html/images/used-in-examples/dialogs/configdialog/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/dialogs/configdialog +@dirrm %%DOCSDIR%%/html/images/used-in-examples/dialogs/classwizard/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/dialogs/classwizard +@dirrm %%DOCSDIR%%/html/images/used-in-examples/dialogs +@dirrm %%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/win +@dirrm %%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images/mac +@dirrm %%DOCSDIR%%/html/images/used-in-examples/demos/textedit/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/demos/textedit +@dirrm %%DOCSDIR%%/html/images/used-in-examples/demos/spreadsheet/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/demos/spreadsheet +@dirrm %%DOCSDIR%%/html/images/used-in-examples/demos/qmediaplayer/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/demos/qmediaplayer +@dirrm %%DOCSDIR%%/html/images/used-in-examples/demos/interview/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/demos/interview +@dirrm %%DOCSDIR%%/html/images/used-in-examples/demos/books/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/demos/books +@dirrm %%DOCSDIR%%/html/images/used-in-examples/demos +@dirrm %%DOCSDIR%%/html/images/used-in-examples/animation/easing/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/animation/easing +@dirrm %%DOCSDIR%%/html/images/used-in-examples/animation/animatedtiles/images +@dirrm %%DOCSDIR%%/html/images/used-in-examples/animation/animatedtiles +@dirrm %%DOCSDIR%%/html/images/used-in-examples/animation +@dirrm %%DOCSDIR%%/html/images/used-in-examples @dirrm %%DOCSDIR%%/html/images @dirrm %%DOCSDIR%%/html @dirrm %%DOCSDIR%% diff --git a/misc/qt4-l10n/Makefile b/misc/qt4-l10n/Makefile index 3a1c3b76cd9f..99e5783be075 100644 --- a/misc/qt4-l10n/Makefile +++ b/misc/qt4-l10n/Makefile @@ -7,25 +7,24 @@ PORTNAME= l10n PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= misc -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt translations messages USE_QT_VER= 4 -QT_COMPONENTS= #dummy -NO_BUILD= yes -MD5_FILE= ${PORTSDIR}/devel/qt4/distinfo +QT_COMPONENTS= linguist_build +QT_DIST= yes +QT_NONSTANDARD= yes EXTRACT_AFTER_ARGS+= | ${TAR} -xf - --include '${DISTNAME}/translations' +do-build: + ${LOCALBASE}/bin/lrelease-qt4 ${WRKSRC}/translations/*.ts + do-install: ${MKDIR} ${PREFIX}/share/qt4/translations - ${INSTALL_DATA} ${WRKSRC}/translations/*.ts ${PREFIX}/share/qt4/translations + ${INSTALL_DATA} ${WRKSRC}/translations/*.qm ${PREFIX}/share/qt4/translations .include <bsd.port.mk> diff --git a/misc/qt4-l10n/pkg-descr b/misc/qt4-l10n/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/misc/qt4-l10n/pkg-descr +++ b/misc/qt4-l10n/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/misc/qt4-l10n/pkg-plist b/misc/qt4-l10n/pkg-plist index 69f266b8431f..ce1cb00668ba 100644 --- a/misc/qt4-l10n/pkg-plist +++ b/misc/qt4-l10n/pkg-plist @@ -1,66 +1,63 @@ -share/qt4/translations/assistant_adp_de.ts -share/qt4/translations/assistant_adp_ja.ts -share/qt4/translations/assistant_adp_pl.ts -share/qt4/translations/assistant_adp_ru.ts -share/qt4/translations/assistant_adp_untranslated.ts -share/qt4/translations/assistant_adp_zh_CN.ts -share/qt4/translations/assistant_adp_zh_TW.ts -share/qt4/translations/assistant_da.ts -share/qt4/translations/assistant_de.ts -share/qt4/translations/assistant_ja.ts -share/qt4/translations/assistant_pl.ts -share/qt4/translations/assistant_ru.ts -share/qt4/translations/assistant_untranslated.ts -share/qt4/translations/assistant_zh_CN.ts -share/qt4/translations/assistant_zh_TW.ts -share/qt4/translations/designer_de.ts -share/qt4/translations/designer_ja.ts -share/qt4/translations/designer_pl.ts -share/qt4/translations/designer_ru.ts -share/qt4/translations/designer_untranslated.ts -share/qt4/translations/designer_zh_CN.ts -share/qt4/translations/designer_zh_TW.ts -share/qt4/translations/linguist_de.ts -share/qt4/translations/linguist_fr.ts -share/qt4/translations/linguist_ja.ts -share/qt4/translations/linguist_pl.ts -share/qt4/translations/linguist_ru.ts -share/qt4/translations/linguist_untranslated.ts -share/qt4/translations/linguist_zh_CN.ts -share/qt4/translations/linguist_zh_TW.ts -share/qt4/translations/qt_ar.ts -share/qt4/translations/qt_da.ts -share/qt4/translations/qt_de.ts -share/qt4/translations/qt_es.ts -share/qt4/translations/qt_fr.ts -share/qt4/translations/qt_help_da.ts -share/qt4/translations/qt_help_de.ts -share/qt4/translations/qt_help_ja.ts -share/qt4/translations/qt_help_pl.ts -share/qt4/translations/qt_help_ru.ts -share/qt4/translations/qt_help_untranslated.ts -share/qt4/translations/qt_help_zh_CN.ts -share/qt4/translations/qt_help_zh_TW.ts -share/qt4/translations/qt_iw.ts -share/qt4/translations/qt_ja_JP.ts -share/qt4/translations/qt_pl.ts -share/qt4/translations/qt_pt.ts -share/qt4/translations/qt_ru.ts -share/qt4/translations/qt_sk.ts -share/qt4/translations/qt_sv.ts -share/qt4/translations/qt_uk.ts -share/qt4/translations/qt_untranslated.ts -share/qt4/translations/qt_zh_CN.ts -share/qt4/translations/qt_zh_TW.ts -share/qt4/translations/qtconfig_pl.ts -share/qt4/translations/qtconfig_ru.ts -share/qt4/translations/qtconfig_untranslated.ts -share/qt4/translations/qtconfig_zh_CN.ts -share/qt4/translations/qtconfig_zh_TW.ts -share/qt4/translations/qvfb_pl.ts -share/qt4/translations/qvfb_ru.ts -share/qt4/translations/qvfb_untranslated.ts -share/qt4/translations/qvfb_zh_CN.ts -share/qt4/translations/qvfb_zh_TW.ts +share/qt4/translations/assistant_adp_de.qm +share/qt4/translations/assistant_adp_ja.qm +share/qt4/translations/assistant_adp_pl.qm +share/qt4/translations/assistant_adp_ru.qm +share/qt4/translations/assistant_adp_zh_CN.qm +share/qt4/translations/assistant_adp_zh_TW.qm +share/qt4/translations/assistant_da.qm +share/qt4/translations/assistant_de.qm +share/qt4/translations/assistant_fr.qm +share/qt4/translations/assistant_ja.qm +share/qt4/translations/assistant_pl.qm +share/qt4/translations/assistant_ru.qm +share/qt4/translations/assistant_zh_CN.qm +share/qt4/translations/assistant_zh_TW.qm +share/qt4/translations/designer_de.qm +share/qt4/translations/designer_fr.qm +share/qt4/translations/designer_ja.qm +share/qt4/translations/designer_pl.qm +share/qt4/translations/designer_ru.qm +share/qt4/translations/designer_sl.qm +share/qt4/translations/designer_zh_CN.qm +share/qt4/translations/designer_zh_TW.qm +share/qt4/translations/linguist_de.qm +share/qt4/translations/linguist_fr.qm +share/qt4/translations/linguist_ja.qm +share/qt4/translations/linguist_pl.qm +share/qt4/translations/linguist_ru.qm +share/qt4/translations/linguist_zh_CN.qm +share/qt4/translations/linguist_zh_TW.qm +share/qt4/translations/qt_ar.qm +share/qt4/translations/qt_da.qm +share/qt4/translations/qt_de.qm +share/qt4/translations/qt_es.qm +share/qt4/translations/qt_fr.qm +share/qt4/translations/qt_help_da.qm +share/qt4/translations/qt_help_de.qm +share/qt4/translations/qt_help_fr.qm +share/qt4/translations/qt_help_ja.qm +share/qt4/translations/qt_help_pl.qm +share/qt4/translations/qt_help_ru.qm +share/qt4/translations/qt_help_zh_CN.qm +share/qt4/translations/qt_help_zh_TW.qm +share/qt4/translations/qt_iw.qm +share/qt4/translations/qt_ja_JP.qm +share/qt4/translations/qt_pl.qm +share/qt4/translations/qt_pt.qm +share/qt4/translations/qt_ru.qm +share/qt4/translations/qt_sk.qm +share/qt4/translations/qt_sl.qm +share/qt4/translations/qt_sv.qm +share/qt4/translations/qt_uk.qm +share/qt4/translations/qt_zh_CN.qm +share/qt4/translations/qt_zh_TW.qm +share/qt4/translations/qtconfig_pl.qm +share/qt4/translations/qtconfig_ru.qm +share/qt4/translations/qtconfig_zh_CN.qm +share/qt4/translations/qtconfig_zh_TW.qm +share/qt4/translations/qvfb_pl.qm +share/qt4/translations/qvfb_ru.qm +share/qt4/translations/qvfb_zh_CN.qm +share/qt4/translations/qvfb_zh_TW.qm @dirrm share/qt4/translations -@dirrm share/qt4 +@dirrmtry share/qt4 diff --git a/misc/qt4-qtconfig/Makefile b/misc/qt4-qtconfig/Makefile index b0d8391d8073..61425f8a6ac1 100644 --- a/misc/qt4-qtconfig/Makefile +++ b/misc/qt4-qtconfig/Makefile @@ -29,27 +29,30 @@ 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/network src/opengl \ - src/script src/svg src/testlib \ - src/tools src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/webkit + src/activeqt src/dbus src/multimedia src/network src/opengl \ + src/openvg src/s60installs src/s60main src/script \ + src/scripttools src/sql src/svg src/testlib src/tools \ + src/winmain src/xml src/xmlpatterns src/3rdparty/clucene \ + src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ + src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../ +BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=qtconfig-qt4|g' \ - ${WRKSRC}/${PORTNAME}.pro - ${ECHO_CMD} "INCLUDEPATH+=${EXTRA_INCL}" >> ${WRKSRC}/${PORTNAME}.pro - ${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/uic-qt4 ${WRKSRC}/../../bin/uic - ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc + ${BUILD_WRKSRC}/${PORTNAME}.pro + ${ECHO_CMD} "INCLUDEPATH+=${EXTRA_INCL}" >> ${BUILD_WRKSRC}/${PORTNAME}.pro + ${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/uic-qt4 ${WRKSRC}/bin/uic + ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc .include <bsd.port.mk> diff --git a/misc/qt4-qtconfig/pkg-descr b/misc/qt4-qtconfig/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/misc/qt4-qtconfig/pkg-descr +++ b/misc/qt4-qtconfig/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/misc/qt4-qtdemo/Makefile b/misc/qt4-qtdemo/Makefile index f1d79cb2a174..5b91393e479a 100644 --- a/misc/qt4-qtdemo/Makefile +++ b/misc/qt4-qtdemo/Makefile @@ -8,7 +8,6 @@ PORTNAME= qtdemo PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= misc PKGNAMEPREFIX= qt4- @@ -19,7 +18,7 @@ USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build rcc_build uic_build assistantclient \ corelib designer gui network opengl sql svg qtestlib xml \ imageformats_run dbus script webkit phonon help assistant_run \ - phonon-gst scripttools xmlpatterns + phonon-gst scripttools xmlpatterns multimedia QT_NONSTANDARD= yes QT_DIST= yes @@ -30,34 +29,38 @@ CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ PATH=${WRKSRC}/bin:$$PATH -DO_NOT_EXTRACT= doc mkspecs qmake translations +DO_NOT_EXTRACT= doc mkspecs qmake translations \ + src/activeqt src/openvg src/s60installs src/s60main src/tools \ + src/winmain src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/demos -CONFIGURE_WRKSRC=${WRKSRC}/../ -PATCH_WRKSRC= ${CONFIGURE_WRKSRC} +BUILD_WRKSRC= ${WRKSRC}/demos +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure post-patch: ${REINPLACE_CMD} -e '/app +=/s|"assistant"|"assistant-qt4"|' \ - ${PATCH_WRKSRC}/demos/qtdemo/menumanager.cpp \ - ${PATCH_WRKSRC}/examples/help/remotecontrol/remotecontrol.cpp \ - ${PATCH_WRKSRC}/examples/help/simpletextviewer/assistant.cpp + ${BUILD_WRKSRC}/${PORTNAME}/menumanager.cpp \ + ${WRKSRC}/examples/help/remotecontrol/remotecontrol.cpp \ + ${WRKSRC}/examples/help/simpletextviewer/assistant.cpp 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 - ${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/../bin/uic - ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../bin/rcc + ${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/uic-qt4 ${WRKSRC}/bin/uic + ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc post-build: - cd ${WRKSRC}/../examples && ${MAKE} -f Makefile first + cd ${WRKSRC}/examples && ${SETENV} MAKEOBJDIR=. ${MAKE} post-install: - cd ${WRKSRC}/../examples && ${MAKE} -f Makefile install + cd ${WRKSRC}/examples && ${SETENV} MAKEOBJDIR=. ${MAKE} install .include <bsd.port.mk> diff --git a/misc/qt4-qtdemo/pkg-descr b/misc/qt4-qtdemo/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/misc/qt4-qtdemo/pkg-descr +++ b/misc/qt4-qtdemo/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/misc/qt4-qtdemo/pkg-plist b/misc/qt4-qtdemo/pkg-plist index 288e662e9a43..a65cdc1b4b20 100644 --- a/misc/qt4-qtdemo/pkg-plist +++ b/misc/qt4-qtdemo/pkg-plist @@ -1,15 +1,15 @@ bin/qtdemo %%DEBUG%%bin/qtdemo.debug -lib/qt4/plugins/designer/libarthurplugin.so -%%DEBUG%%lib/qt4/plugins/designer/libarthurplugin.so.debug -lib/qt4/plugins/designer/libcontainerextension.so -%%DEBUG%%lib/qt4/plugins/designer/libcontainerextension.so.debug -lib/qt4/plugins/designer/libcustomwidgetplugin.so -%%DEBUG%%lib/qt4/plugins/designer/libcustomwidgetplugin.so.debug -lib/qt4/plugins/designer/libtaskmenuextension.so -%%DEBUG%%lib/qt4/plugins/designer/libtaskmenuextension.so.debug -lib/qt4/plugins/designer/libworldtimeclockplugin.so -%%DEBUG%%lib/qt4/plugins/designer/libworldtimeclockplugin.so.debug +%%QT_PLUGINDIR_REL%%/designer/libarthurplugin.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libarthurplugin.so.debug +%%QT_PLUGINDIR_REL%%/designer/libcontainerextension.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libcontainerextension.so.debug +%%QT_PLUGINDIR_REL%%/designer/libcustomwidgetplugin.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libcustomwidgetplugin.so.debug +%%QT_PLUGINDIR_REL%%/designer/libtaskmenuextension.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libtaskmenuextension.so.debug +%%QT_PLUGINDIR_REL%%/designer/libworldtimeclockplugin.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libworldtimeclockplugin.so.debug share/examples/qt4/demos/README share/examples/qt4/demos/affine/affine %%DEBUG%%share/examples/qt4/demos/affine/affine.debug @@ -69,8 +69,6 @@ share/examples/qt4/demos/boxes/glbuffers.cpp share/examples/qt4/demos/boxes/glbuffers.h share/examples/qt4/demos/boxes/glextensions.cpp share/examples/qt4/demos/boxes/glextensions.h -share/examples/qt4/demos/boxes/glshaders.cpp -share/examples/qt4/demos/boxes/glshaders.h share/examples/qt4/demos/boxes/gltrianglemesh.h share/examples/qt4/demos/boxes/granite.fsh share/examples/qt4/demos/boxes/main.cpp @@ -90,8 +88,8 @@ share/examples/qt4/demos/boxes/smiley.png share/examples/qt4/demos/boxes/square.jpg share/examples/qt4/demos/boxes/trackball.cpp share/examples/qt4/demos/boxes/trackball.h -share/examples/qt4/demos/boxes/vector.h share/examples/qt4/demos/boxes/wood.fsh +share/examples/qt4/demos/browser/Info_mac.plist share/examples/qt4/demos/browser/addbookmarkdialog.ui share/examples/qt4/demos/browser/autosaver.cpp share/examples/qt4/demos/browser/autosaver.h @@ -242,15 +240,6 @@ share/examples/qt4/demos/mainwindow/titlebarLeft.png share/examples/qt4/demos/mainwindow/titlebarRight.png share/examples/qt4/demos/mainwindow/toolbar.cpp share/examples/qt4/demos/mainwindow/toolbar.h -share/examples/qt4/demos/mediaplayer/images/screen.png -share/examples/qt4/demos/mediaplayer/main.cpp -share/examples/qt4/demos/mediaplayer/mediaplayer -share/examples/qt4/demos/mediaplayer/mediaplayer.cpp -%%DEBUG%%share/examples/qt4/demos/mediaplayer/mediaplayer.debug -share/examples/qt4/demos/mediaplayer/mediaplayer.h -share/examples/qt4/demos/mediaplayer/mediaplayer.pro -share/examples/qt4/demos/mediaplayer/mediaplayer.qrc -share/examples/qt4/demos/mediaplayer/settings.ui share/examples/qt4/demos/pathstroke/main.cpp share/examples/qt4/demos/pathstroke/pathstroke share/examples/qt4/demos/pathstroke/pathstroke.cpp @@ -259,6 +248,16 @@ share/examples/qt4/demos/pathstroke/pathstroke.h share/examples/qt4/demos/pathstroke/pathstroke.html share/examples/qt4/demos/pathstroke/pathstroke.pro share/examples/qt4/demos/pathstroke/pathstroke.qrc +share/examples/qt4/demos/qmediaplayer/images/screen.png +share/examples/qt4/demos/qmediaplayer/main.cpp +share/examples/qt4/demos/qmediaplayer/mediaplayer.cpp +share/examples/qt4/demos/qmediaplayer/mediaplayer.h +share/examples/qt4/demos/qmediaplayer/mediaplayer.qrc +share/examples/qt4/demos/qmediaplayer/qmediaplayer +%%DEBUG%%share/examples/qt4/demos/qmediaplayer/qmediaplayer.debug +share/examples/qt4/demos/qmediaplayer/qmediaplayer.pro +share/examples/qt4/demos/qmediaplayer/settings.ui +share/examples/qt4/demos/qtdemo/Info_mac.plist share/examples/qt4/demos/qtdemo/colors.cpp share/examples/qt4/demos/qtdemo/colors.h share/examples/qt4/demos/qtdemo/demoitem.cpp @@ -385,6 +384,78 @@ share/examples/qt4/demos/sqlbrowser/qsqlconnectiondialog.ui share/examples/qt4/demos/sqlbrowser/sqlbrowser %%DEBUG%%share/examples/qt4/demos/sqlbrowser/sqlbrowser.debug share/examples/qt4/demos/sqlbrowser/sqlbrowser.pro +share/examples/qt4/demos/sub-attaq/animationmanager.cpp +share/examples/qt4/demos/sub-attaq/animationmanager.h +share/examples/qt4/demos/sub-attaq/boat.cpp +share/examples/qt4/demos/sub-attaq/boat.h +share/examples/qt4/demos/sub-attaq/boat_p.h +share/examples/qt4/demos/sub-attaq/bomb.cpp +share/examples/qt4/demos/sub-attaq/bomb.h +share/examples/qt4/demos/sub-attaq/graphicsscene.cpp +share/examples/qt4/demos/sub-attaq/graphicsscene.h +share/examples/qt4/demos/sub-attaq/main.cpp +share/examples/qt4/demos/sub-attaq/mainwindow.cpp +share/examples/qt4/demos/sub-attaq/mainwindow.h +share/examples/qt4/demos/sub-attaq/pics/big/background.png +share/examples/qt4/demos/sub-attaq/pics/big/boat.png +share/examples/qt4/demos/sub-attaq/pics/big/bomb.png +share/examples/qt4/demos/sub-attaq/pics/big/explosion/boat/step1.png +share/examples/qt4/demos/sub-attaq/pics/big/explosion/boat/step2.png +share/examples/qt4/demos/sub-attaq/pics/big/explosion/boat/step3.png +share/examples/qt4/demos/sub-attaq/pics/big/explosion/boat/step4.png +share/examples/qt4/demos/sub-attaq/pics/big/explosion/submarine/step1.png +share/examples/qt4/demos/sub-attaq/pics/big/explosion/submarine/step2.png +share/examples/qt4/demos/sub-attaq/pics/big/explosion/submarine/step3.png +share/examples/qt4/demos/sub-attaq/pics/big/explosion/submarine/step4.png +share/examples/qt4/demos/sub-attaq/pics/big/submarine.png +share/examples/qt4/demos/sub-attaq/pics/big/surface.png +share/examples/qt4/demos/sub-attaq/pics/big/torpedo.png +share/examples/qt4/demos/sub-attaq/pics/scalable/background-n810.svg +share/examples/qt4/demos/sub-attaq/pics/scalable/background.svg +share/examples/qt4/demos/sub-attaq/pics/scalable/boat.svg +share/examples/qt4/demos/sub-attaq/pics/scalable/bomb.svg +share/examples/qt4/demos/sub-attaq/pics/scalable/sand.svg +share/examples/qt4/demos/sub-attaq/pics/scalable/see.svg +share/examples/qt4/demos/sub-attaq/pics/scalable/sky.svg +share/examples/qt4/demos/sub-attaq/pics/scalable/sub-attaq.svg +share/examples/qt4/demos/sub-attaq/pics/scalable/submarine.svg +share/examples/qt4/demos/sub-attaq/pics/scalable/surface.svg +share/examples/qt4/demos/sub-attaq/pics/scalable/torpedo.svg +share/examples/qt4/demos/sub-attaq/pics/small/background.png +share/examples/qt4/demos/sub-attaq/pics/small/boat.png +share/examples/qt4/demos/sub-attaq/pics/small/bomb.png +share/examples/qt4/demos/sub-attaq/pics/small/submarine.png +share/examples/qt4/demos/sub-attaq/pics/small/surface.png +share/examples/qt4/demos/sub-attaq/pics/small/torpedo.png +share/examples/qt4/demos/sub-attaq/pics/welcome/logo-a.png +share/examples/qt4/demos/sub-attaq/pics/welcome/logo-a2.png +share/examples/qt4/demos/sub-attaq/pics/welcome/logo-b.png +share/examples/qt4/demos/sub-attaq/pics/welcome/logo-dash.png +share/examples/qt4/demos/sub-attaq/pics/welcome/logo-excl.png +share/examples/qt4/demos/sub-attaq/pics/welcome/logo-q.png +share/examples/qt4/demos/sub-attaq/pics/welcome/logo-s.png +share/examples/qt4/demos/sub-attaq/pics/welcome/logo-t.png +share/examples/qt4/demos/sub-attaq/pics/welcome/logo-t2.png +share/examples/qt4/demos/sub-attaq/pics/welcome/logo-u.png +share/examples/qt4/demos/sub-attaq/pixmapitem.cpp +share/examples/qt4/demos/sub-attaq/pixmapitem.h +share/examples/qt4/demos/sub-attaq/progressitem.cpp +share/examples/qt4/demos/sub-attaq/progressitem.h +share/examples/qt4/demos/sub-attaq/qanimationstate.cpp +share/examples/qt4/demos/sub-attaq/qanimationstate.h +share/examples/qt4/demos/sub-attaq/states.cpp +share/examples/qt4/demos/sub-attaq/states.h +share/examples/qt4/demos/sub-attaq/sub-attaq +%%DEBUG%%share/examples/qt4/demos/sub-attaq/sub-attaq.debug +share/examples/qt4/demos/sub-attaq/sub-attaq.pro +share/examples/qt4/demos/sub-attaq/subattaq.qrc +share/examples/qt4/demos/sub-attaq/submarine.cpp +share/examples/qt4/demos/sub-attaq/submarine.h +share/examples/qt4/demos/sub-attaq/submarine_p.h +share/examples/qt4/demos/sub-attaq/textinformationitem.cpp +share/examples/qt4/demos/sub-attaq/textinformationitem.h +share/examples/qt4/demos/sub-attaq/torpedo.cpp +share/examples/qt4/demos/sub-attaq/torpedo.h share/examples/qt4/demos/textedit/example.html share/examples/qt4/demos/textedit/images/logo32.png share/examples/qt4/demos/textedit/images/mac/editcopy.png @@ -461,6 +532,59 @@ share/examples/qt4/demos/undo/undo share/examples/qt4/demos/undo/undo.pro share/examples/qt4/demos/undo/undo.qrc share/examples/qt4/examples/README +share/examples/qt4/examples/animation/README +share/examples/qt4/examples/animation/animatedtiles/animatedtiles +%%DEBUG%%share/examples/qt4/examples/animation/animatedtiles/animatedtiles.debug +share/examples/qt4/examples/animation/animatedtiles/animatedtiles.pro +share/examples/qt4/examples/animation/animatedtiles/animatedtiles.qrc +share/examples/qt4/examples/animation/animatedtiles/images/Time-For-Lunch-2.jpg +share/examples/qt4/examples/animation/animatedtiles/images/centered.png +share/examples/qt4/examples/animation/animatedtiles/images/ellipse.png +share/examples/qt4/examples/animation/animatedtiles/images/figure8.png +share/examples/qt4/examples/animation/animatedtiles/images/kinetic.png +share/examples/qt4/examples/animation/animatedtiles/images/random.png +share/examples/qt4/examples/animation/animatedtiles/images/tile.png +share/examples/qt4/examples/animation/animatedtiles/main.cpp +share/examples/qt4/examples/animation/animation.pro +share/examples/qt4/examples/animation/appchooser/appchooser +%%DEBUG%%share/examples/qt4/examples/animation/appchooser/appchooser.debug +share/examples/qt4/examples/animation/appchooser/appchooser.pro +share/examples/qt4/examples/animation/appchooser/appchooser.qrc +share/examples/qt4/examples/animation/appchooser/main.cpp +share/examples/qt4/examples/animation/easing/animation.h +share/examples/qt4/examples/animation/easing/easing +%%DEBUG%%share/examples/qt4/examples/animation/easing/easing.debug +share/examples/qt4/examples/animation/easing/easing.pro +share/examples/qt4/examples/animation/easing/easing.qrc +share/examples/qt4/examples/animation/easing/form.ui +share/examples/qt4/examples/animation/easing/images/qt-logo.png +share/examples/qt4/examples/animation/easing/main.cpp +share/examples/qt4/examples/animation/easing/window.cpp +share/examples/qt4/examples/animation/easing/window.h +share/examples/qt4/examples/animation/moveblocks/main.cpp +share/examples/qt4/examples/animation/moveblocks/moveblocks +%%DEBUG%%share/examples/qt4/examples/animation/moveblocks/moveblocks.debug +share/examples/qt4/examples/animation/moveblocks/moveblocks.pro +share/examples/qt4/examples/animation/states/main.cpp +share/examples/qt4/examples/animation/states/states +%%DEBUG%%share/examples/qt4/examples/animation/states/states.debug +share/examples/qt4/examples/animation/states/states.pro +share/examples/qt4/examples/animation/states/states.qrc +share/examples/qt4/examples/animation/stickman/animation.cpp +share/examples/qt4/examples/animation/stickman/animation.h +share/examples/qt4/examples/animation/stickman/graphicsview.cpp +share/examples/qt4/examples/animation/stickman/graphicsview.h +share/examples/qt4/examples/animation/stickman/lifecycle.cpp +share/examples/qt4/examples/animation/stickman/lifecycle.h +share/examples/qt4/examples/animation/stickman/main.cpp +share/examples/qt4/examples/animation/stickman/node.cpp +share/examples/qt4/examples/animation/stickman/node.h +share/examples/qt4/examples/animation/stickman/stickman +share/examples/qt4/examples/animation/stickman/stickman.cpp +%%DEBUG%%share/examples/qt4/examples/animation/stickman/stickman.debug +share/examples/qt4/examples/animation/stickman/stickman.h +share/examples/qt4/examples/animation/stickman/stickman.pro +share/examples/qt4/examples/animation/stickman/stickman.qrc share/examples/qt4/examples/assistant/README share/examples/qt4/examples/assistant/assistant.pro share/examples/qt4/examples/assistant/simpletextviewer/documentation/about.txt @@ -485,12 +609,6 @@ share/examples/qt4/examples/assistant/simpletextviewer/main.cpp share/examples/qt4/examples/assistant/simpletextviewer/mainwindow.cpp share/examples/qt4/examples/assistant/simpletextviewer/mainwindow.h share/examples/qt4/examples/assistant/simpletextviewer/simpletextviewer -share/examples/qt4/examples/itemviews/frozencolumn/freezetablewidget.cpp -share/examples/qt4/examples/itemviews/frozencolumn/freezetablewidget.h -share/examples/qt4/examples/itemviews/frozencolumn/frozencolumn -share/examples/qt4/examples/itemviews/frozencolumn/frozencolumn.pro -share/examples/qt4/examples/itemviews/frozencolumn/grades.qrc -share/examples/qt4/examples/itemviews/frozencolumn/main.cpp %%DEBUG%%share/examples/qt4/examples/assistant/simpletextviewer/simpletextviewer.debug share/examples/qt4/examples/assistant/simpletextviewer/simpletextviewer.pro share/examples/qt4/examples/dbus/chat/chat.cpp @@ -741,8 +859,44 @@ share/examples/qt4/examples/draganddrop/puzzle/puzzle.pro share/examples/qt4/examples/draganddrop/puzzle/puzzle.qrc share/examples/qt4/examples/draganddrop/puzzle/puzzlewidget.cpp share/examples/qt4/examples/draganddrop/puzzle/puzzlewidget.h +share/examples/qt4/examples/effects/blurpicker/blureffect.cpp +share/examples/qt4/examples/effects/blurpicker/blureffect.h +share/examples/qt4/examples/effects/blurpicker/blurpicker +share/examples/qt4/examples/effects/blurpicker/blurpicker.cpp +%%DEBUG%%share/examples/qt4/examples/effects/blurpicker/blurpicker.debug +share/examples/qt4/examples/effects/blurpicker/blurpicker.h +share/examples/qt4/examples/effects/blurpicker/blurpicker.pro +share/examples/qt4/examples/effects/blurpicker/blurpicker.qrc +share/examples/qt4/examples/effects/blurpicker/main.cpp +share/examples/qt4/examples/effects/effects.pro +share/examples/qt4/examples/effects/fademessage/fademessage +share/examples/qt4/examples/effects/fademessage/fademessage.cpp +%%DEBUG%%share/examples/qt4/examples/effects/fademessage/fademessage.debug +share/examples/qt4/examples/effects/fademessage/fademessage.h +share/examples/qt4/examples/effects/fademessage/fademessage.pro +share/examples/qt4/examples/effects/fademessage/fademessage.qrc +share/examples/qt4/examples/effects/fademessage/main.cpp +share/examples/qt4/examples/effects/lighting/lighting +share/examples/qt4/examples/effects/lighting/lighting.cpp +%%DEBUG%%share/examples/qt4/examples/effects/lighting/lighting.debug +share/examples/qt4/examples/effects/lighting/lighting.h +share/examples/qt4/examples/effects/lighting/lighting.pro +share/examples/qt4/examples/effects/lighting/main.cpp share/examples/qt4/examples/examples.pro +share/examples/qt4/examples/gestures/gestures.pro +share/examples/qt4/examples/gestures/imagegestures/imagegestures +%%DEBUG%%share/examples/qt4/examples/gestures/imagegestures/imagegestures.debug +share/examples/qt4/examples/gestures/imagegestures/imagegestures.pro +share/examples/qt4/examples/gestures/imagegestures/imagewidget.cpp +share/examples/qt4/examples/gestures/imagegestures/imagewidget.h +share/examples/qt4/examples/gestures/imagegestures/main.cpp +share/examples/qt4/examples/gestures/imagegestures/mainwidget.cpp +share/examples/qt4/examples/gestures/imagegestures/mainwidget.h share/examples/qt4/examples/graphicsview/README +share/examples/qt4/examples/graphicsview/anchorlayout/anchorlayout +%%DEBUG%%share/examples/qt4/examples/graphicsview/anchorlayout/anchorlayout.debug +share/examples/qt4/examples/graphicsview/anchorlayout/anchorlayout.pro +share/examples/qt4/examples/graphicsview/anchorlayout/main.cpp share/examples/qt4/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts %%DEBUG%%share/examples/qt4/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.debug share/examples/qt4/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro @@ -1027,6 +1181,17 @@ share/examples/qt4/examples/graphicsview/portedcanvas/portedcanvas.pro share/examples/qt4/examples/graphicsview/portedcanvas/portedcanvas.qrc share/examples/qt4/examples/graphicsview/portedcanvas/qt-trans.xpm share/examples/qt4/examples/graphicsview/portedcanvas/qtlogo.png +share/examples/qt4/examples/graphicsview/weatheranchorlayout/images/5days.jpg +share/examples/qt4/examples/graphicsview/weatheranchorlayout/images/details.jpg +share/examples/qt4/examples/graphicsview/weatheranchorlayout/images/place.jpg +share/examples/qt4/examples/graphicsview/weatheranchorlayout/images/tabbar.jpg +share/examples/qt4/examples/graphicsview/weatheranchorlayout/images/title.jpg +share/examples/qt4/examples/graphicsview/weatheranchorlayout/images/weather-few-clouds.png +share/examples/qt4/examples/graphicsview/weatheranchorlayout/main.cpp +share/examples/qt4/examples/graphicsview/weatheranchorlayout/weatheranchorlayout +%%DEBUG%%share/examples/qt4/examples/graphicsview/weatheranchorlayout/weatheranchorlayout.debug +share/examples/qt4/examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro +share/examples/qt4/examples/graphicsview/weatheranchorlayout/weatheranchorlayout.qrc share/examples/qt4/examples/help/README share/examples/qt4/examples/help/contextsensitivehelp/contextsensitivehelp %%DEBUG%%share/examples/qt4/examples/help/contextsensitivehelp/contextsensitivehelp.debug @@ -1198,6 +1363,13 @@ share/examples/qt4/examples/itemviews/fetchmore/filelistmodel.h share/examples/qt4/examples/itemviews/fetchmore/main.cpp share/examples/qt4/examples/itemviews/fetchmore/window.cpp share/examples/qt4/examples/itemviews/fetchmore/window.h +share/examples/qt4/examples/itemviews/frozencolumn/freezetablewidget.cpp +share/examples/qt4/examples/itemviews/frozencolumn/freezetablewidget.h +share/examples/qt4/examples/itemviews/frozencolumn/frozencolumn +%%DEBUG%%share/examples/qt4/examples/itemviews/frozencolumn/frozencolumn.debug +share/examples/qt4/examples/itemviews/frozencolumn/frozencolumn.pro +share/examples/qt4/examples/itemviews/frozencolumn/grades.qrc +share/examples/qt4/examples/itemviews/frozencolumn/main.cpp share/examples/qt4/examples/itemviews/itemviews.pro share/examples/qt4/examples/itemviews/pixelator/imagemodel.cpp share/examples/qt4/examples/itemviews/pixelator/imagemodel.h @@ -1384,6 +1556,63 @@ share/examples/qt4/examples/mainwindows/sdi/sdi %%DEBUG%%share/examples/qt4/examples/mainwindows/sdi/sdi.debug share/examples/qt4/examples/mainwindows/sdi/sdi.pro share/examples/qt4/examples/mainwindows/sdi/sdi.qrc +share/examples/qt4/examples/multimedia/README +share/examples/qt4/examples/multimedia/audiodevices/audiodevices +share/examples/qt4/examples/multimedia/audiodevices/audiodevices.cpp +%%DEBUG%%share/examples/qt4/examples/multimedia/audiodevices/audiodevices.debug +share/examples/qt4/examples/multimedia/audiodevices/audiodevices.h +share/examples/qt4/examples/multimedia/audiodevices/audiodevices.pro +share/examples/qt4/examples/multimedia/audiodevices/audiodevicesbase.ui +share/examples/qt4/examples/multimedia/audiodevices/main.cpp +share/examples/qt4/examples/multimedia/audioinput/audioinput +share/examples/qt4/examples/multimedia/audioinput/audioinput.cpp +%%DEBUG%%share/examples/qt4/examples/multimedia/audioinput/audioinput.debug +share/examples/qt4/examples/multimedia/audioinput/audioinput.h +share/examples/qt4/examples/multimedia/audioinput/audioinput.pro +share/examples/qt4/examples/multimedia/audioinput/main.cpp +share/examples/qt4/examples/multimedia/audiooutput/audiooutput +share/examples/qt4/examples/multimedia/audiooutput/audiooutput.cpp +%%DEBUG%%share/examples/qt4/examples/multimedia/audiooutput/audiooutput.debug +share/examples/qt4/examples/multimedia/audiooutput/audiooutput.h +share/examples/qt4/examples/multimedia/audiooutput/audiooutput.pro +share/examples/qt4/examples/multimedia/audiooutput/main.cpp +share/examples/qt4/examples/multimedia/multimedia.pro +share/examples/qt4/examples/multimedia/videographicsitem/main.cpp +share/examples/qt4/examples/multimedia/videographicsitem/videographicsitem +%%DEBUG%%share/examples/qt4/examples/multimedia/videographicsitem/videographicsitem.debug +share/examples/qt4/examples/multimedia/videographicsitem/videographicsitem.pro +share/examples/qt4/examples/multimedia/videographicsitem/videoitem.cpp +share/examples/qt4/examples/multimedia/videographicsitem/videoitem.h +share/examples/qt4/examples/multimedia/videographicsitem/videoplayer.cpp +share/examples/qt4/examples/multimedia/videographicsitem/videoplayer.h +share/examples/qt4/examples/multimedia/videowidget/main.cpp +share/examples/qt4/examples/multimedia/videowidget/videoplayer.cpp +share/examples/qt4/examples/multimedia/videowidget/videoplayer.h +share/examples/qt4/examples/multimedia/videowidget/videowidget +share/examples/qt4/examples/multimedia/videowidget/videowidget.cpp +%%DEBUG%%share/examples/qt4/examples/multimedia/videowidget/videowidget.debug +share/examples/qt4/examples/multimedia/videowidget/videowidget.h +share/examples/qt4/examples/multimedia/videowidget/videowidget.pro +share/examples/qt4/examples/multimedia/videowidget/videowidgetsurface.cpp +share/examples/qt4/examples/multimedia/videowidget/videowidgetsurface.h +share/examples/qt4/examples/multitouch/fingerpaint/fingerpaint +%%DEBUG%%share/examples/qt4/examples/multitouch/fingerpaint/fingerpaint.debug +share/examples/qt4/examples/multitouch/fingerpaint/fingerpaint.pro +share/examples/qt4/examples/multitouch/fingerpaint/main.cpp +share/examples/qt4/examples/multitouch/fingerpaint/mainwindow.cpp +share/examples/qt4/examples/multitouch/fingerpaint/mainwindow.h +share/examples/qt4/examples/multitouch/fingerpaint/scribblearea.cpp +share/examples/qt4/examples/multitouch/fingerpaint/scribblearea.h +share/examples/qt4/examples/multitouch/pinchzoom/graphicsview.cpp +share/examples/qt4/examples/multitouch/pinchzoom/graphicsview.h +share/examples/qt4/examples/multitouch/pinchzoom/images/cheese.jpg +share/examples/qt4/examples/multitouch/pinchzoom/main.cpp +share/examples/qt4/examples/multitouch/pinchzoom/mice.qrc +share/examples/qt4/examples/multitouch/pinchzoom/mouse.cpp +share/examples/qt4/examples/multitouch/pinchzoom/mouse.h +share/examples/qt4/examples/multitouch/pinchzoom/pinchzoom +%%DEBUG%%share/examples/qt4/examples/multitouch/pinchzoom/pinchzoom.debug +share/examples/qt4/examples/multitouch/pinchzoom/pinchzoom.pro share/examples/qt4/examples/network/README share/examples/qt4/examples/network/blockingfortuneclient/blockingclient.cpp share/examples/qt4/examples/network/blockingfortuneclient/blockingclient.h @@ -1429,16 +1658,6 @@ share/examples/qt4/examples/network/fortuneserver/fortuneserver.pro share/examples/qt4/examples/network/fortuneserver/main.cpp share/examples/qt4/examples/network/fortuneserver/server.cpp share/examples/qt4/examples/network/fortuneserver/server.h -share/examples/qt4/examples/network/ftp/ftp -%%DEBUG%%share/examples/qt4/examples/network/ftp/ftp.debug -share/examples/qt4/examples/network/ftp/ftp.pro -share/examples/qt4/examples/network/ftp/ftp.qrc -share/examples/qt4/examples/network/ftp/ftpwindow.cpp -share/examples/qt4/examples/network/ftp/ftpwindow.h -share/examples/qt4/examples/network/ftp/images/cdtoparent.png -share/examples/qt4/examples/network/ftp/images/dir.png -share/examples/qt4/examples/network/ftp/images/file.png -share/examples/qt4/examples/network/ftp/main.cpp share/examples/qt4/examples/network/googlesuggest/googlesuggest share/examples/qt4/examples/network/googlesuggest/googlesuggest.cpp %%DEBUG%%share/examples/qt4/examples/network/googlesuggest/googlesuggest.debug @@ -1476,6 +1695,16 @@ share/examples/qt4/examples/network/network-chat/peermanager.h share/examples/qt4/examples/network/network-chat/server.cpp share/examples/qt4/examples/network/network-chat/server.h share/examples/qt4/examples/network/network.pro +share/examples/qt4/examples/network/qftp/ftp.qrc +share/examples/qt4/examples/network/qftp/ftpwindow.cpp +share/examples/qt4/examples/network/qftp/ftpwindow.h +share/examples/qt4/examples/network/qftp/images/cdtoparent.png +share/examples/qt4/examples/network/qftp/images/dir.png +share/examples/qt4/examples/network/qftp/images/file.png +share/examples/qt4/examples/network/qftp/main.cpp +share/examples/qt4/examples/network/qftp/qftp +%%DEBUG%%share/examples/qt4/examples/network/qftp/qftp.debug +share/examples/qt4/examples/network/qftp/qftp.pro share/examples/qt4/examples/network/securesocketclient/certificateinfo.cpp share/examples/qt4/examples/network/securesocketclient/certificateinfo.h share/examples/qt4/examples/network/securesocketclient/certificateinfo.ui @@ -1582,6 +1811,8 @@ share/examples/qt4/examples/opengl/hellogl/hellogl %%DEBUG%%share/examples/qt4/examples/opengl/hellogl/hellogl.debug share/examples/qt4/examples/opengl/hellogl/hellogl.pro share/examples/qt4/examples/opengl/hellogl/main.cpp +share/examples/qt4/examples/opengl/hellogl/qtlogo.cpp +share/examples/qt4/examples/opengl/hellogl/qtlogo.h share/examples/qt4/examples/opengl/hellogl/window.cpp share/examples/qt4/examples/opengl/hellogl/window.h share/examples/qt4/examples/opengl/opengl.pro @@ -1593,6 +1824,10 @@ share/examples/qt4/examples/opengl/overpainting/main.cpp share/examples/qt4/examples/opengl/overpainting/overpainting %%DEBUG%%share/examples/qt4/examples/opengl/overpainting/overpainting.debug share/examples/qt4/examples/opengl/overpainting/overpainting.pro +share/examples/qt4/examples/opengl/overpainting/qtlogo.cpp +share/examples/qt4/examples/opengl/overpainting/qtlogo.h +share/examples/qt4/examples/opengl/pbuffers/cube.cpp +share/examples/qt4/examples/opengl/pbuffers/cube.h share/examples/qt4/examples/opengl/pbuffers/cubelogo.png share/examples/qt4/examples/opengl/pbuffers/glwidget.cpp share/examples/qt4/examples/opengl/pbuffers/glwidget.h @@ -1715,13 +1950,13 @@ share/examples/qt4/examples/phonon/capabilities/capabilities.pro share/examples/qt4/examples/phonon/capabilities/main.cpp share/examples/qt4/examples/phonon/capabilities/window.cpp share/examples/qt4/examples/phonon/capabilities/window.h -share/examples/qt4/examples/phonon/musicplayer/main.cpp -share/examples/qt4/examples/phonon/musicplayer/mainwindow.cpp -share/examples/qt4/examples/phonon/musicplayer/mainwindow.h -share/examples/qt4/examples/phonon/musicplayer/musicplayer -%%DEBUG%%share/examples/qt4/examples/phonon/musicplayer/musicplayer.debug -share/examples/qt4/examples/phonon/musicplayer/musicplayer.pro share/examples/qt4/examples/phonon/phonon.pro +share/examples/qt4/examples/phonon/qmusicplayer/main.cpp +share/examples/qt4/examples/phonon/qmusicplayer/mainwindow.cpp +share/examples/qt4/examples/phonon/qmusicplayer/mainwindow.h +share/examples/qt4/examples/phonon/qmusicplayer/qmusicplayer +%%DEBUG%%share/examples/qt4/examples/phonon/qmusicplayer/qmusicplayer.debug +share/examples/qt4/examples/phonon/qmusicplayer/qmusicplayer.pro share/examples/qt4/examples/qtconcurrent/README share/examples/qt4/examples/qtconcurrent/imagescaling/imagescaling share/examples/qt4/examples/qtconcurrent/imagescaling/imagescaling.cpp @@ -1946,6 +2181,35 @@ share/examples/qt4/examples/sql/tablemodel/tablemodel share/examples/qt4/examples/sql/tablemodel/tablemodel.cpp %%DEBUG%%share/examples/qt4/examples/sql/tablemodel/tablemodel.debug share/examples/qt4/examples/sql/tablemodel/tablemodel.pro +share/examples/qt4/examples/statemachine/README +share/examples/qt4/examples/statemachine/eventtransitions/eventtransitions +%%DEBUG%%share/examples/qt4/examples/statemachine/eventtransitions/eventtransitions.debug +share/examples/qt4/examples/statemachine/eventtransitions/eventtransitions.pro +share/examples/qt4/examples/statemachine/eventtransitions/main.cpp +share/examples/qt4/examples/statemachine/factorial/factorial +%%DEBUG%%share/examples/qt4/examples/statemachine/factorial/factorial.debug +share/examples/qt4/examples/statemachine/factorial/factorial.pro +share/examples/qt4/examples/statemachine/factorial/main.cpp +share/examples/qt4/examples/statemachine/pingpong/main.cpp +share/examples/qt4/examples/statemachine/pingpong/pingpong +%%DEBUG%%share/examples/qt4/examples/statemachine/pingpong/pingpong.debug +share/examples/qt4/examples/statemachine/pingpong/pingpong.pro +share/examples/qt4/examples/statemachine/rogue/main.cpp +share/examples/qt4/examples/statemachine/rogue/movementtransition.h +share/examples/qt4/examples/statemachine/rogue/rogue +%%DEBUG%%share/examples/qt4/examples/statemachine/rogue/rogue.debug +share/examples/qt4/examples/statemachine/rogue/rogue.pro +share/examples/qt4/examples/statemachine/rogue/window.cpp +share/examples/qt4/examples/statemachine/rogue/window.h +share/examples/qt4/examples/statemachine/statemachine.pro +share/examples/qt4/examples/statemachine/trafficlight/main.cpp +share/examples/qt4/examples/statemachine/trafficlight/trafficlight +%%DEBUG%%share/examples/qt4/examples/statemachine/trafficlight/trafficlight.debug +share/examples/qt4/examples/statemachine/trafficlight/trafficlight.pro +share/examples/qt4/examples/statemachine/twowaybutton/main.cpp +share/examples/qt4/examples/statemachine/twowaybutton/twowaybutton +%%DEBUG%%share/examples/qt4/examples/statemachine/twowaybutton/twowaybutton.debug +share/examples/qt4/examples/statemachine/twowaybutton/twowaybutton.pro share/examples/qt4/examples/threads/README share/examples/qt4/examples/threads/mandelbrot/main.cpp share/examples/qt4/examples/threads/mandelbrot/mandelbrot @@ -1990,6 +2254,12 @@ share/examples/qt4/examples/tools/completer/mainwindow.cpp share/examples/qt4/examples/tools/completer/mainwindow.h share/examples/qt4/examples/tools/completer/resources/countries.txt share/examples/qt4/examples/tools/completer/resources/wordlist.txt +share/examples/qt4/examples/tools/contiguouscache/contiguouscache +%%DEBUG%%share/examples/qt4/examples/tools/contiguouscache/contiguouscache.debug +share/examples/qt4/examples/tools/contiguouscache/contiguouscache.pro +share/examples/qt4/examples/tools/contiguouscache/main.cpp +share/examples/qt4/examples/tools/contiguouscache/randomlistmodel.cpp +share/examples/qt4/examples/tools/contiguouscache/randomlistmodel.h share/examples/qt4/examples/tools/customcompleter/customcompleter %%DEBUG%%share/examples/qt4/examples/tools/customcompleter/customcompleter.debug share/examples/qt4/examples/tools/customcompleter/customcompleter.pro @@ -2050,6 +2320,16 @@ share/examples/qt4/examples/tools/i18n/translations/i18n_sv.qm share/examples/qt4/examples/tools/i18n/translations/i18n_sv.ts share/examples/qt4/examples/tools/i18n/translations/i18n_zh.qm share/examples/qt4/examples/tools/i18n/translations/i18n_zh.ts +share/examples/qt4/examples/tools/inputpanel/inputpanel +%%DEBUG%%share/examples/qt4/examples/tools/inputpanel/inputpanel.debug +share/examples/qt4/examples/tools/inputpanel/inputpanel.pro +share/examples/qt4/examples/tools/inputpanel/main.cpp +share/examples/qt4/examples/tools/inputpanel/mainform.ui +share/examples/qt4/examples/tools/inputpanel/myinputpanel.cpp +share/examples/qt4/examples/tools/inputpanel/myinputpanel.h +share/examples/qt4/examples/tools/inputpanel/myinputpanelcontext.cpp +share/examples/qt4/examples/tools/inputpanel/myinputpanelcontext.h +share/examples/qt4/examples/tools/inputpanel/myinputpanelform.ui share/examples/qt4/examples/tools/plugandpaint/interfaces.h share/examples/qt4/examples/tools/plugandpaint/main.cpp share/examples/qt4/examples/tools/plugandpaint/mainwindow.cpp @@ -2199,6 +2479,13 @@ share/examples/qt4/examples/uitools/textfinder/textfinder.h share/examples/qt4/examples/uitools/textfinder/textfinder.pro share/examples/qt4/examples/uitools/textfinder/textfinder.qrc share/examples/qt4/examples/uitools/uitools.pro +share/examples/qt4/examples/webkit/domtraversal/domtraversal +%%DEBUG%%share/examples/qt4/examples/webkit/domtraversal/domtraversal.debug +share/examples/qt4/examples/webkit/domtraversal/domtraversal.pro +share/examples/qt4/examples/webkit/domtraversal/main.cpp +share/examples/qt4/examples/webkit/domtraversal/window.cpp +share/examples/qt4/examples/webkit/domtraversal/window.h +share/examples/qt4/examples/webkit/domtraversal/window.ui share/examples/qt4/examples/webkit/fancybrowser/fancybrowser %%DEBUG%%share/examples/qt4/examples/webkit/fancybrowser/fancybrowser.debug share/examples/qt4/examples/webkit/fancybrowser/fancybrowser.pro @@ -2208,8 +2495,8 @@ share/examples/qt4/examples/webkit/fancybrowser/mainwindow.cpp share/examples/qt4/examples/webkit/fancybrowser/mainwindow.h share/examples/qt4/examples/webkit/formextractor/form.html share/examples/qt4/examples/webkit/formextractor/formextractor -%%DEBUG%%share/examples/qt4/examples/webkit/formextractor/formExtractor.debug share/examples/qt4/examples/webkit/formextractor/formextractor.cpp +%%DEBUG%%share/examples/qt4/examples/webkit/formextractor/formextractor.debug share/examples/qt4/examples/webkit/formextractor/formextractor.h share/examples/qt4/examples/webkit/formextractor/formextractor.pro share/examples/qt4/examples/webkit/formextractor/formextractor.qrc @@ -2233,6 +2520,13 @@ share/examples/qt4/examples/webkit/previewer/previewer.cpp share/examples/qt4/examples/webkit/previewer/previewer.h share/examples/qt4/examples/webkit/previewer/previewer.pro share/examples/qt4/examples/webkit/previewer/previewer.ui +share/examples/qt4/examples/webkit/simpleselector/main.cpp +share/examples/qt4/examples/webkit/simpleselector/simpleselector +%%DEBUG%%share/examples/qt4/examples/webkit/simpleselector/simpleselector.debug +share/examples/qt4/examples/webkit/simpleselector/simpleselector.pro +share/examples/qt4/examples/webkit/simpleselector/window.cpp +share/examples/qt4/examples/webkit/simpleselector/window.h +share/examples/qt4/examples/webkit/simpleselector/window.ui share/examples/qt4/examples/webkit/webkit.pro share/examples/qt4/examples/widgets/README share/examples/qt4/examples/widgets/analogclock/analogclock @@ -2483,6 +2777,16 @@ share/examples/qt4/examples/xml/dombookmarks/mainwindow.cpp share/examples/qt4/examples/xml/dombookmarks/mainwindow.h share/examples/qt4/examples/xml/dombookmarks/xbeltree.cpp share/examples/qt4/examples/xml/dombookmarks/xbeltree.h +share/examples/qt4/examples/xml/htmlinfo/apache_org.html +share/examples/qt4/examples/xml/htmlinfo/htmlinfo +%%DEBUG%%share/examples/qt4/examples/xml/htmlinfo/htmlinfo.debug +share/examples/qt4/examples/xml/htmlinfo/htmlinfo.pro +share/examples/qt4/examples/xml/htmlinfo/main.cpp +share/examples/qt4/examples/xml/htmlinfo/nokia_com.html +share/examples/qt4/examples/xml/htmlinfo/simpleexample.html +share/examples/qt4/examples/xml/htmlinfo/trolltech_com.html +share/examples/qt4/examples/xml/htmlinfo/w3c_org.html +share/examples/qt4/examples/xml/htmlinfo/youtube_com.html share/examples/qt4/examples/xml/rsslisting/main.cpp share/examples/qt4/examples/xml/rsslisting/rsslisting share/examples/qt4/examples/xml/rsslisting/rsslisting.cpp @@ -2559,6 +2863,24 @@ share/examples/qt4/examples/xmlpatterns/recipes/recipes.pro share/examples/qt4/examples/xmlpatterns/recipes/recipes.qrc share/examples/qt4/examples/xmlpatterns/recipes/xmlsyntaxhighlighter.cpp share/examples/qt4/examples/xmlpatterns/recipes/xmlsyntaxhighlighter.h +share/examples/qt4/examples/xmlpatterns/schema/files/contact.xsd +share/examples/qt4/examples/xmlpatterns/schema/files/invalid_contact.xml +share/examples/qt4/examples/xmlpatterns/schema/files/invalid_order.xml +share/examples/qt4/examples/xmlpatterns/schema/files/invalid_recipe.xml +share/examples/qt4/examples/xmlpatterns/schema/files/order.xsd +share/examples/qt4/examples/xmlpatterns/schema/files/recipe.xsd +share/examples/qt4/examples/xmlpatterns/schema/files/valid_contact.xml +share/examples/qt4/examples/xmlpatterns/schema/files/valid_order.xml +share/examples/qt4/examples/xmlpatterns/schema/files/valid_recipe.xml +share/examples/qt4/examples/xmlpatterns/schema/main.cpp +share/examples/qt4/examples/xmlpatterns/schema/mainwindow.cpp +share/examples/qt4/examples/xmlpatterns/schema/mainwindow.h +share/examples/qt4/examples/xmlpatterns/schema/schema +%%DEBUG%%share/examples/qt4/examples/xmlpatterns/schema/schema.debug +share/examples/qt4/examples/xmlpatterns/schema/schema.pro +share/examples/qt4/examples/xmlpatterns/schema/schema.qrc +share/examples/qt4/examples/xmlpatterns/schema/xmlsyntaxhighlighter.cpp +share/examples/qt4/examples/xmlpatterns/schema/xmlsyntaxhighlighter.h share/examples/qt4/examples/xmlpatterns/trafficinfo/main.cpp share/examples/qt4/examples/xmlpatterns/trafficinfo/mainwindow.cpp share/examples/qt4/examples/xmlpatterns/trafficinfo/mainwindow.h @@ -2581,6 +2903,8 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro @dirrm share/examples/qt4/examples/xmlpatterns/xquery/globalVariables @dirrm share/examples/qt4/examples/xmlpatterns/xquery @dirrm share/examples/qt4/examples/xmlpatterns/trafficinfo +@dirrm share/examples/qt4/examples/xmlpatterns/schema/files +@dirrm share/examples/qt4/examples/xmlpatterns/schema @dirrm share/examples/qt4/examples/xmlpatterns/recipes/forms @dirrm share/examples/qt4/examples/xmlpatterns/recipes/files @dirrm share/examples/qt4/examples/xmlpatterns/recipes @@ -2591,6 +2915,7 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro @dirrm share/examples/qt4/examples/xml/streambookmarks @dirrm share/examples/qt4/examples/xml/saxbookmarks @dirrm share/examples/qt4/examples/xml/rsslisting +@dirrm share/examples/qt4/examples/xml/htmlinfo @dirrm share/examples/qt4/examples/xml/dombookmarks @dirrm share/examples/qt4/examples/xml @dirrm share/examples/qt4/examples/widgets/windowflags @@ -2623,10 +2948,12 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro @dirrm share/examples/qt4/examples/widgets/calculator @dirrm share/examples/qt4/examples/widgets/analogclock @dirrm share/examples/qt4/examples/widgets +@dirrm share/examples/qt4/examples/webkit/simpleselector @dirrm share/examples/qt4/examples/webkit/previewer @dirrm share/examples/qt4/examples/webkit/googlechat @dirrm share/examples/qt4/examples/webkit/formextractor @dirrm share/examples/qt4/examples/webkit/fancybrowser +@dirrm share/examples/qt4/examples/webkit/domtraversal @dirrm share/examples/qt4/examples/webkit @dirrm share/examples/qt4/examples/uitools/textfinder/forms @dirrm share/examples/qt4/examples/uitools/textfinder @@ -2657,6 +2984,7 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro @dirrm share/examples/qt4/examples/tools/plugandpaintplugins @dirrm share/examples/qt4/examples/tools/plugandpaint/plugins @dirrm share/examples/qt4/examples/tools/plugandpaint +@dirrm share/examples/qt4/examples/tools/inputpanel @dirrm share/examples/qt4/examples/tools/i18n/translations @dirrm share/examples/qt4/examples/tools/i18n @dirrm share/examples/qt4/examples/tools/echoplugin/plugin @@ -2664,6 +2992,7 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro @dirrm share/examples/qt4/examples/tools/echoplugin @dirrm share/examples/qt4/examples/tools/customcompleter/resources @dirrm share/examples/qt4/examples/tools/customcompleter +@dirrm share/examples/qt4/examples/tools/contiguouscache @dirrm share/examples/qt4/examples/tools/completer/resources @dirrm share/examples/qt4/examples/tools/completer @dirrm share/examples/qt4/examples/tools/codecs/encodedfiles @@ -2673,6 +3002,13 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro @dirrm share/examples/qt4/examples/threads/semaphores @dirrm share/examples/qt4/examples/threads/mandelbrot @dirrm share/examples/qt4/examples/threads +@dirrm share/examples/qt4/examples/statemachine/twowaybutton +@dirrm share/examples/qt4/examples/statemachine/trafficlight +@dirrm share/examples/qt4/examples/statemachine/rogue +@dirrm share/examples/qt4/examples/statemachine/pingpong +@dirrm share/examples/qt4/examples/statemachine/factorial +@dirrm share/examples/qt4/examples/statemachine/eventtransitions +@dirrm share/examples/qt4/examples/statemachine @dirrm share/examples/qt4/examples/sql/tablemodel @dirrm share/examples/qt4/examples/sql/sqlwidgetmapper @dirrm share/examples/qt4/examples/sql/relationaltablemodel @@ -2710,7 +3046,7 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro @dirrm share/examples/qt4/examples/qtconcurrent/map @dirrm share/examples/qt4/examples/qtconcurrent/imagescaling @dirrm share/examples/qt4/examples/qtconcurrent -@dirrm share/examples/qt4/examples/phonon/musicplayer +@dirrm share/examples/qt4/examples/phonon/qmusicplayer @dirrm share/examples/qt4/examples/phonon/capabilities @dirrm share/examples/qt4/examples/phonon @dirrm share/examples/qt4/examples/painting/transformations @@ -2742,12 +3078,12 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro @dirrm share/examples/qt4/examples/network/torrent @dirrm share/examples/qt4/examples/network/threadedfortuneserver @dirrm share/examples/qt4/examples/network/securesocketclient +@dirrm share/examples/qt4/examples/network/qftp/images +@dirrm share/examples/qt4/examples/network/qftp @dirrm share/examples/qt4/examples/network/network-chat @dirrm share/examples/qt4/examples/network/loopback @dirrm share/examples/qt4/examples/network/http @dirrm share/examples/qt4/examples/network/googlesuggest -@dirrm share/examples/qt4/examples/network/ftp/images -@dirrm share/examples/qt4/examples/network/ftp @dirrm share/examples/qt4/examples/network/fortuneserver @dirrm share/examples/qt4/examples/network/fortuneclient @dirrm share/examples/qt4/examples/network/downloadmanager @@ -2756,6 +3092,16 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro @dirrm share/examples/qt4/examples/network/broadcastreceiver @dirrm share/examples/qt4/examples/network/blockingfortuneclient @dirrm share/examples/qt4/examples/network +@dirrm share/examples/qt4/examples/multitouch/pinchzoom/images +@dirrm share/examples/qt4/examples/multitouch/pinchzoom +@dirrm share/examples/qt4/examples/multitouch/fingerpaint +@dirrm share/examples/qt4/examples/multitouch +@dirrm share/examples/qt4/examples/multimedia/videowidget +@dirrm share/examples/qt4/examples/multimedia/videographicsitem +@dirrm share/examples/qt4/examples/multimedia/audiooutput +@dirrm share/examples/qt4/examples/multimedia/audioinput +@dirrm share/examples/qt4/examples/multimedia/audiodevices +@dirrm share/examples/qt4/examples/multimedia @dirrm share/examples/qt4/examples/mainwindows/sdi/images @dirrm share/examples/qt4/examples/mainwindows/sdi @dirrm share/examples/qt4/examples/mainwindows/recentfiles @@ -2807,6 +3153,8 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro @dirrm share/examples/qt4/examples/help/contextsensitivehelp/doc @dirrm share/examples/qt4/examples/help/contextsensitivehelp @dirrm share/examples/qt4/examples/help +@dirrm share/examples/qt4/examples/graphicsview/weatheranchorlayout/images +@dirrm share/examples/qt4/examples/graphicsview/weatheranchorlayout @dirrm share/examples/qt4/examples/graphicsview/portedcanvas @dirrm share/examples/qt4/examples/graphicsview/portedasteroids/sprites/ship @dirrm share/examples/qt4/examples/graphicsview/portedasteroids/sprites/shield @@ -2830,7 +3178,14 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro @dirrm share/examples/qt4/examples/graphicsview/collidingmice/images @dirrm share/examples/qt4/examples/graphicsview/collidingmice @dirrm share/examples/qt4/examples/graphicsview/basicgraphicslayouts +@dirrm share/examples/qt4/examples/graphicsview/anchorlayout @dirrm share/examples/qt4/examples/graphicsview +@dirrm share/examples/qt4/examples/gestures/imagegestures +@dirrm share/examples/qt4/examples/gestures +@dirrm share/examples/qt4/examples/effects/lighting +@dirrm share/examples/qt4/examples/effects/fademessage +@dirrm share/examples/qt4/examples/effects/blurpicker +@dirrm share/examples/qt4/examples/effects @dirrm share/examples/qt4/examples/draganddrop/puzzle @dirrm share/examples/qt4/examples/draganddrop/fridgemagnets @dirrm share/examples/qt4/examples/draganddrop/dropsite @@ -2875,6 +3230,15 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro @dirrm share/examples/qt4/examples/assistant/simpletextviewer/documentation @dirrm share/examples/qt4/examples/assistant/simpletextviewer @dirrm share/examples/qt4/examples/assistant +@dirrm share/examples/qt4/examples/animation/stickman +@dirrm share/examples/qt4/examples/animation/states +@dirrm share/examples/qt4/examples/animation/moveblocks +@dirrm share/examples/qt4/examples/animation/easing/images +@dirrm share/examples/qt4/examples/animation/easing +@dirrm share/examples/qt4/examples/animation/appchooser +@dirrm share/examples/qt4/examples/animation/animatedtiles/images +@dirrm share/examples/qt4/examples/animation/animatedtiles +@dirrm share/examples/qt4/examples/animation @dirrm share/examples/qt4/examples @dirrm share/examples/qt4/demos/undo/icons @dirrm share/examples/qt4/demos/undo @@ -2882,6 +3246,15 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro @dirrm share/examples/qt4/demos/textedit/images/mac @dirrm share/examples/qt4/demos/textedit/images @dirrm share/examples/qt4/demos/textedit +@dirrm share/examples/qt4/demos/sub-attaq/pics/welcome +@dirrm share/examples/qt4/demos/sub-attaq/pics/small +@dirrm share/examples/qt4/demos/sub-attaq/pics/scalable +@dirrm share/examples/qt4/demos/sub-attaq/pics/big/explosion/submarine +@dirrm share/examples/qt4/demos/sub-attaq/pics/big/explosion/boat +@dirrm share/examples/qt4/demos/sub-attaq/pics/big/explosion +@dirrm share/examples/qt4/demos/sub-attaq/pics/big +@dirrm share/examples/qt4/demos/sub-attaq/pics +@dirrm share/examples/qt4/demos/sub-attaq @dirrm share/examples/qt4/demos/sqlbrowser @dirrm share/examples/qt4/demos/spreadsheet/images @dirrm share/examples/qt4/demos/spreadsheet @@ -2890,9 +3263,9 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro @dirrm share/examples/qt4/demos/qtdemo/xml @dirrm share/examples/qt4/demos/qtdemo/images @dirrm share/examples/qt4/demos/qtdemo +@dirrm share/examples/qt4/demos/qmediaplayer/images +@dirrm share/examples/qt4/demos/qmediaplayer @dirrm share/examples/qt4/demos/pathstroke -@dirrm share/examples/qt4/demos/mediaplayer/images -@dirrm share/examples/qt4/demos/mediaplayer @dirrm share/examples/qt4/demos/mainwindow @dirrm share/examples/qt4/demos/interview/images @dirrm share/examples/qt4/demos/interview @@ -2912,3 +3285,5 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro @dirrm share/examples/qt4/demos/affine @dirrm share/examples/qt4/demos @dirrm share/examples/qt4 +@dirrmtry %%QT_PLUGINDIR_REL%%/designer +@dirrmtry %%QT_PLUGINDIR_REL%% diff --git a/multimedia/Makefile b/multimedia/Makefile index ea0f8c1174cd..726fd678001b 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -243,6 +243,7 @@ SUBDIR += py-qt4-phonon SUBDIR += pyjama SUBDIR += qdvdauthor + SUBDIR += qt4-multimedia SUBDIR += qt4-phonon SUBDIR += qt4-phonon-gst SUBDIR += quark diff --git a/multimedia/qt4-multimedia/Makefile b/multimedia/qt4-multimedia/Makefile new file mode 100644 index 000000000000..573f03d20be8 --- /dev/null +++ b/multimedia/qt4-multimedia/Makefile @@ -0,0 +1,63 @@ +# New ports collection makefile for: qt4-multimedia +# Date created: 17 September 2009 +# Whom: Alberto Villa <villa.alberto@gmail.com> +# +# $FreeBSD$ +# + +PORTNAME= multimedia +PORTVERSION= ${QT4_VERSION} +CATEGORIES?= multimedia +PKGNAMEPREFIX= qt4- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt4 low-level multimedia API + +USE_QT_VER= 4 +QT_COMPONENTS= qmake_build moc_build uic_build corelib gui +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/activeqt src/dbus src/network src/opengl src/openvg \ + src/phonon src/qt3support src/s60installs src/s60main \ + src/script src/scripttools src/sql src/svg src/testlib \ + src/tools src/winmain src/xml src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon 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} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure + +pre-configure: + ${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/uic-qt4 ${WRKSRC}/bin/uic + +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' \ + -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ + ${WRKSRC}/lib/pkgconfig/QtMultimedia.pc + +.include <bsd.port.mk> diff --git a/multimedia/qt4-multimedia/pkg-descr b/multimedia/qt4-multimedia/pkg-descr new file mode 100644 index 000000000000..36bc69717e98 --- /dev/null +++ b/multimedia/qt4-multimedia/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://qt.nokia.com/products/qt/index.html diff --git a/multimedia/qt4-multimedia/pkg-plist b/multimedia/qt4-multimedia/pkg-plist new file mode 100644 index 000000000000..dbaa07b895b6 --- /dev/null +++ b/multimedia/qt4-multimedia/pkg-plist @@ -0,0 +1,49 @@ +include/qt4/Qt/QtMultimedia +include/qt4/Qt/qabstractvideobuffer.h +include/qt4/Qt/qabstractvideosurface.h +include/qt4/Qt/qaudio.h +include/qt4/Qt/qaudiodeviceinfo.h +include/qt4/Qt/qaudioengine.h +include/qt4/Qt/qaudioengineplugin.h +include/qt4/Qt/qaudioformat.h +include/qt4/Qt/qaudioinput.h +include/qt4/Qt/qaudiooutput.h +include/qt4/Qt/qvideoframe.h +include/qt4/Qt/qvideosurfaceformat.h +include/qt4/QtMultimedia/QAbstractAudioDeviceInfo +include/qt4/QtMultimedia/QAbstractAudioInput +include/qt4/QtMultimedia/QAbstractAudioOutput +include/qt4/QtMultimedia/QAbstractVideoBuffer +include/qt4/QtMultimedia/QAbstractVideoSurface +include/qt4/QtMultimedia/QAudioDeviceInfo +include/qt4/QtMultimedia/QAudioEngineFactoryInterface +include/qt4/QtMultimedia/QAudioEnginePlugin +include/qt4/QtMultimedia/QAudioFormat +include/qt4/QtMultimedia/QAudioInput +include/qt4/QtMultimedia/QAudioOutput +include/qt4/QtMultimedia/QVideoFrame +include/qt4/QtMultimedia/QVideoSurfaceFormat +include/qt4/QtMultimedia/QtMultimedia +include/qt4/QtMultimedia/qabstractvideobuffer.h +include/qt4/QtMultimedia/qabstractvideosurface.h +include/qt4/QtMultimedia/qaudio.h +include/qt4/QtMultimedia/qaudiodeviceinfo.h +include/qt4/QtMultimedia/qaudioengine.h +include/qt4/QtMultimedia/qaudioengineplugin.h +include/qt4/QtMultimedia/qaudioformat.h +include/qt4/QtMultimedia/qaudioinput.h +include/qt4/QtMultimedia/qaudiooutput.h +include/qt4/QtMultimedia/qvideoframe.h +include/qt4/QtMultimedia/qvideosurfaceformat.h +lib/qt4/libQtMultimedia.la +lib/qt4/libQtMultimedia.prl +lib/qt4/libQtMultimedia.so +lib/qt4/libQtMultimedia.so.4 +lib/qt4/libQtMultimedia.so.%%SHLIB_SHVER%% +lib/qt4/libQtMultimedia.so.%%SHLIB_VER%% +%%DEBUG%%lib/qt4/libQtMultimedia.so.%%SHLIB_VER%%.debug +libdata/pkgconfig/QtMultimedia.pc +@dirrmtry lib/qt4 +@dirrm include/qt4/QtMultimedia +@dirrmtry include/qt4/Qt +@dirrmtry include/qt4 diff --git a/multimedia/qt4-phonon-gst/Makefile b/multimedia/qt4-phonon-gst/Makefile index 51f977dd6e5f..cd3dab4f21e0 100644 --- a/multimedia/qt4-phonon-gst/Makefile +++ b/multimedia/qt4-phonon-gst/Makefile @@ -29,23 +29,30 @@ MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ - src/network \ - src/qt3support src/script src/sql src/svg src/testlib \ - src/tools src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/webkit + src/activeqt src/dbus src/multimedia src/network src/openvg \ + src/qt3support src/s60installs src/s60main src/script \ + src/scripttools src/sql src/svg src/testlib src/tools \ + src/winmain src/xml src/xmlpatterns src/3rdparty/clucene \ + src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ + src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/plugins/phonon/gstreamer -CONFIGURE_WRKSRC=${WRKSRC}/../../../../ +BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/gstreamer +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure + +.if defined(WITH_KDE_PHONON) +IGNORE= conflicts with multimedia/phonon-gstreamer. You have defined WITH_KDE_PHONON to override Qt4 phonon +.endif pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} - ${ECHO_CMD} "DEFINES+= QT_OPENGL" >> ${WRKSRC}/gstreamer.pro - ${MKDIR} ${WRKSRC}/../../../../mkspecs - ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../../bin/qmake - ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../../../bin/moc + ${ECHO_CMD} "DEFINES+= QT_OPENGL" >> ${BUILD_WRKSRC}/gstreamer.pro + ${MKDIR} ${WRKSRC}/mkspecs + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake + ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc .include <bsd.port.mk> diff --git a/multimedia/qt4-phonon-gst/pkg-descr b/multimedia/qt4-phonon-gst/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/multimedia/qt4-phonon-gst/pkg-descr +++ b/multimedia/qt4-phonon-gst/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/multimedia/qt4-phonon-gst/pkg-plist b/multimedia/qt4-phonon-gst/pkg-plist index d96b9a932b09..7d2d4843ecb1 100644 --- a/multimedia/qt4-phonon-gst/pkg-plist +++ b/multimedia/qt4-phonon-gst/pkg-plist @@ -1,3 +1,4 @@ -lib/qt4/plugins/phonon_backend/libphonon_gstreamer.so -%%DEBUG%%lib/qt4/plugins/phonon_backend/libphonon_gstreamer.so.debug -@dirrmtry lib/qt4/plugins/phonon_backend +%%QT_PLUGINDIR_REL%%/phonon_backend/libphonon_gstreamer.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/phonon_backend/libphonon_gstreamer.so.debug +@dirrmtry %%QT_PLUGINDIR_REL%%/phonon_backend +@dirrmtry %%QT_PLUGINDIR_REL%% diff --git a/multimedia/qt4-phonon/Makefile b/multimedia/qt4-phonon/Makefile index 56de6baaae64..39aed4d497f2 100644 --- a/multimedia/qt4-phonon/Makefile +++ b/multimedia/qt4-phonon/Makefile @@ -30,10 +30,12 @@ MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ - src/network src/opengl \ - src/qt3support src/script src/sql src/svg src/testlib \ - src/tools src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/webkit + src/activeqt src/multimedia src/network src/opengl src/openvg \ + src/qt3support src/s60installs src/s60main src/script \ + src/scripttools src/sql src/svg src/testlib src/tools \ + src/winmain src/xmlpatterns src/3rdparty/clucene \ + src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ + src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' @@ -42,14 +44,15 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure + .include <bsd.port.pre.mk> -.if exists(${KDE4_PREFIX}/lib/libphonon.so) -IGNORE= conflicts with KDE4 phonon. Please, deinstall multimedia/phonon +.if defined(WITH_KDE_PHONON) +IGNORE= conflicts with multimedia/phonon. You have defined WITH_KDE_PHONON to override Qt4 phonon .endif 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 @@ -64,7 +67,6 @@ pre-install: post-install: ${MKDIR} ${QT_PLUGINDIR}/phonon_backend - ${LN} -sf ${LOCALBASE}/include/qt4/phonon ${LOCALBASE}/include/qt4/Phonon - ${LN} -sf ${LOCALBASE}/include/qt4/Phonon/phononnamespace.h ${LOCALBASE}/include/qt4/Phonon/Global + ${LN} -sf ${PREFIX}/include/qt4/phonon ${PREFIX}/include/qt4/Phonon .include <bsd.port.post.mk> diff --git a/multimedia/qt4-phonon/pkg-descr b/multimedia/qt4-phonon/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/multimedia/qt4-phonon/pkg-descr +++ b/multimedia/qt4-phonon/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/multimedia/qt4-phonon/pkg-plist b/multimedia/qt4-phonon/pkg-plist index 98b55a71a329..f85ff269236e 100644 --- a/multimedia/qt4-phonon/pkg-plist +++ b/multimedia/qt4-phonon/pkg-plist @@ -1,49 +1,48 @@ include/qt4/Phonon +include/qt4/phonon/AbstractAudioOutput +include/qt4/phonon/AbstractMediaStream +include/qt4/phonon/AbstractVideoOutput +include/qt4/phonon/AddonInterface +include/qt4/phonon/AudioCaptureDevice +include/qt4/phonon/AudioCaptureDeviceModel +include/qt4/phonon/AudioChannelDescription +include/qt4/phonon/AudioChannelDescriptionModel +include/qt4/phonon/AudioOutput +include/qt4/phonon/AudioOutputDevice +include/qt4/phonon/AudioOutputDeviceModel +include/qt4/phonon/AudioOutputInterface +include/qt4/phonon/AudioOutputInterface40 +include/qt4/phonon/AudioOutputInterface42 +include/qt4/phonon/BackendCapabilities +include/qt4/phonon/BackendInterface +include/qt4/phonon/Effect +include/qt4/phonon/EffectDescription +include/qt4/phonon/EffectDescriptionModel +include/qt4/phonon/EffectInterface +include/qt4/phonon/EffectParameter +include/qt4/phonon/EffectWidget include/qt4/phonon/Global -include/qt4/phonon/Phonon/AbstractAudioOutput -include/qt4/phonon/Phonon/AbstractMediaStream -include/qt4/phonon/Phonon/AbstractVideoOutput -include/qt4/phonon/Phonon/AddonInterface -include/qt4/phonon/Phonon/AudioCaptureDevice -include/qt4/phonon/Phonon/AudioCaptureDeviceModel -include/qt4/phonon/Phonon/AudioChannelDescription -include/qt4/phonon/Phonon/AudioChannelDescriptionModel -include/qt4/phonon/Phonon/AudioOutput -include/qt4/phonon/Phonon/AudioOutputDevice -include/qt4/phonon/Phonon/AudioOutputDeviceModel -include/qt4/phonon/Phonon/AudioOutputInterface -include/qt4/phonon/Phonon/AudioOutputInterface40 -include/qt4/phonon/Phonon/AudioOutputInterface42 -include/qt4/phonon/Phonon/BackendCapabilities -include/qt4/phonon/Phonon/BackendInterface -include/qt4/phonon/Phonon/Effect -include/qt4/phonon/Phonon/EffectDescription -include/qt4/phonon/Phonon/EffectDescriptionModel -include/qt4/phonon/Phonon/EffectInterface -include/qt4/phonon/Phonon/EffectParameter -include/qt4/phonon/Phonon/EffectWidget -include/qt4/phonon/Phonon/Global -include/qt4/phonon/Phonon/MediaController -include/qt4/phonon/Phonon/MediaNode -include/qt4/phonon/Phonon/MediaObject -include/qt4/phonon/Phonon/MediaObjectInterface -include/qt4/phonon/Phonon/MediaSource -include/qt4/phonon/Phonon/ObjectDescription -include/qt4/phonon/Phonon/ObjectDescriptionData -include/qt4/phonon/Phonon/ObjectDescriptionModel -include/qt4/phonon/Phonon/ObjectDescriptionModelData -include/qt4/phonon/Phonon/Path -include/qt4/phonon/Phonon/PlatformPlugin -include/qt4/phonon/Phonon/SeekSlider -include/qt4/phonon/Phonon/StreamInterface -include/qt4/phonon/Phonon/SubtitleDescription -include/qt4/phonon/Phonon/SubtitleDescriptionModel -include/qt4/phonon/Phonon/VideoPlayer -include/qt4/phonon/Phonon/VideoWidget -include/qt4/phonon/Phonon/VideoWidgetInterface -include/qt4/phonon/Phonon/VolumeFaderEffect -include/qt4/phonon/Phonon/VolumeFaderInterface -include/qt4/phonon/Phonon/VolumeSlider +include/qt4/phonon/MediaController +include/qt4/phonon/MediaNode +include/qt4/phonon/MediaObject +include/qt4/phonon/MediaObjectInterface +include/qt4/phonon/MediaSource +include/qt4/phonon/ObjectDescription +include/qt4/phonon/ObjectDescriptionData +include/qt4/phonon/ObjectDescriptionModel +include/qt4/phonon/ObjectDescriptionModelData +include/qt4/phonon/Path +include/qt4/phonon/PlatformPlugin +include/qt4/phonon/SeekSlider +include/qt4/phonon/StreamInterface +include/qt4/phonon/SubtitleDescription +include/qt4/phonon/SubtitleDescriptionModel +include/qt4/phonon/VideoPlayer +include/qt4/phonon/VideoWidget +include/qt4/phonon/VideoWidgetInterface +include/qt4/phonon/VolumeFaderEffect +include/qt4/phonon/VolumeFaderInterface +include/qt4/phonon/VolumeSlider include/qt4/phonon/abstractaudiooutput.h include/qt4/phonon/abstractmediastream.h include/qt4/phonon/abstractvideooutput.h @@ -85,10 +84,8 @@ lib/qt4/libphonon.so.4.3 lib/qt4/libphonon.so.4.3.1 %%DEBUG%%lib/qt4/libphonon.so.4.3.1.debug libdata/pkgconfig/phonon.pc -@dirrm lib/qt4/plugins/phonon_backend -@dirrm lib/qt4/plugins -@dirrm lib/qt4 -@dirrmtry include/qt4/phonon/Phonon +@dirrmtry lib/qt4 @dirrm include/qt4/phonon -@dirrmtry %%QT_PLUGINDIR_REL%%//phonon_backend -@dirrm include/qt4 +@dirrmtry include/qt4 +@exec mkdir -p %%QT_PLUGINDIR_REL%%/phonon_backend +@dirrmtry %%QT_PLUGINDIR_REL%%/phonon_backend diff --git a/net/qt4-network/Makefile b/net/qt4-network/Makefile index 76084b845d39..a30935f5ba2c 100644 --- a/net/qt4-network/Makefile +++ b/net/qt4-network/Makefile @@ -8,7 +8,6 @@ PORTNAME= network PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= net ipv6 PKGNAMEPREFIX= qt4- @@ -31,31 +30,35 @@ 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/gui src/opengl src/phonon \ - src/qt3support src/script src/sql src/svg src/testlib \ - src/tools src/xml src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/gui src/multimedia src/opengl \ + src/openvg src/phonon src/qt3support src/s60installs \ + src/s60main src/script src/scripttools src/sql src/svg \ + src/testlib src/tools src/winmain src/xml src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../ +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-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 - ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc + ${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' ${WRKSRC}/Makefile + -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' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ - ${WRKSRC}/../../lib/pkgconfig/QtNetwork.pc + ${WRKSRC}/lib/pkgconfig/QtNetwork.pc .include <bsd.port.mk> diff --git a/net/qt4-network/pkg-descr b/net/qt4-network/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/net/qt4-network/pkg-descr +++ b/net/qt4-network/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/net/qt4-network/pkg-plist b/net/qt4-network/pkg-plist index c24b20bb9480..e077ccfdacc8 100644 --- a/net/qt4-network/pkg-plist +++ b/net/qt4-network/pkg-plist @@ -1,6 +1,6 @@ include/qt4/Qt/QtNetwork -include/qt4/Qt/qabstractsocket.h include/qt4/Qt/qabstractnetworkcache.h +include/qt4/Qt/qabstractsocket.h include/qt4/Qt/qauthenticator.h include/qt4/Qt/qftp.h include/qt4/Qt/qhostaddress.h @@ -10,6 +10,7 @@ include/qt4/Qt/qlocalserver.h include/qt4/Qt/qlocalsocket.h include/qt4/Qt/qnetworkaccessmanager.h include/qt4/Qt/qnetworkcookie.h +include/qt4/Qt/qnetworkcookiejar.h include/qt4/Qt/qnetworkdiskcache.h include/qt4/Qt/qnetworkinterface.h include/qt4/Qt/qnetworkproxy.h @@ -26,8 +27,8 @@ include/qt4/Qt/qtcpserver.h include/qt4/Qt/qtcpsocket.h include/qt4/Qt/qudpsocket.h include/qt4/Qt/qurlinfo.h -include/qt4/QtNetwork/QAbstractSocket include/qt4/QtNetwork/QAbstractNetworkCache +include/qt4/QtNetwork/QAbstractSocket include/qt4/QtNetwork/QAuthenticator include/qt4/QtNetwork/QFtp include/qt4/QtNetwork/QHostAddress @@ -41,15 +42,15 @@ include/qt4/QtNetwork/QLocalServer include/qt4/QtNetwork/QLocalSocket include/qt4/QtNetwork/QNetworkAccessManager include/qt4/QtNetwork/QNetworkAddressEntry +include/qt4/QtNetwork/QNetworkCacheMetaData include/qt4/QtNetwork/QNetworkCookie include/qt4/QtNetwork/QNetworkCookieJar +include/qt4/QtNetwork/QNetworkDiskCache include/qt4/QtNetwork/QNetworkInterface include/qt4/QtNetwork/QNetworkProxy -include/qt4/QtNetwork/QNetworkReply -include/qt4/QtNetwork/QNetworkDiskCache -include/qt4/QtNetwork/QNetworkProxyQuery include/qt4/QtNetwork/QNetworkProxyFactory -include/qt4/QtNetwork/QNetworkCacheMetaData +include/qt4/QtNetwork/QNetworkProxyQuery +include/qt4/QtNetwork/QNetworkReply include/qt4/QtNetwork/QNetworkRequest include/qt4/QtNetwork/QSsl include/qt4/QtNetwork/QSslCertificate @@ -64,8 +65,8 @@ include/qt4/QtNetwork/QUdpSocket include/qt4/QtNetwork/QUrlInfo include/qt4/QtNetwork/Q_IPV6ADDR include/qt4/QtNetwork/QtNetwork -include/qt4/QtNetwork/qabstractsocket.h include/qt4/QtNetwork/qabstractnetworkcache.h +include/qt4/QtNetwork/qabstractsocket.h include/qt4/QtNetwork/qauthenticator.h include/qt4/QtNetwork/qftp.h include/qt4/QtNetwork/qhostaddress.h @@ -75,6 +76,7 @@ include/qt4/QtNetwork/qlocalserver.h include/qt4/QtNetwork/qlocalsocket.h include/qt4/QtNetwork/qnetworkaccessmanager.h include/qt4/QtNetwork/qnetworkcookie.h +include/qt4/QtNetwork/qnetworkcookiejar.h include/qt4/QtNetwork/qnetworkdiskcache.h include/qt4/QtNetwork/qnetworkinterface.h include/qt4/QtNetwork/qnetworkproxy.h @@ -94,11 +96,12 @@ include/qt4/QtNetwork/qurlinfo.h lib/qt4/libQtNetwork.la lib/qt4/libQtNetwork.prl lib/qt4/libQtNetwork.so -%%DEBUG%%lib/qt4/libQtNetwork.so.%%SHLIB_VER%%.debug lib/qt4/libQtNetwork.so.4 lib/qt4/libQtNetwork.so.%%SHLIB_SHVER%% lib/qt4/libQtNetwork.so.%%SHLIB_VER%% +%%DEBUG%%lib/qt4/libQtNetwork.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtNetwork.pc +@dirrmtry lib/qt4 @dirrm include/qt4/QtNetwork @dirrmtry include/qt4/Qt @dirrmtry include/qt4 diff --git a/textproc/qt4-clucene/Makefile b/textproc/qt4-clucene/Makefile index 5c143705f46f..2222444632b6 100644 --- a/textproc/qt4-clucene/Makefile +++ b/textproc/qt4-clucene/Makefile @@ -8,7 +8,6 @@ PORTNAME= clucene PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= textproc PKGNAMEPREFIX= qt4- @@ -30,31 +29,35 @@ 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/gui src/network src/opengl src/phonon \ - src/qt3support src/script src/sql src/svg src/testlib \ - src/tools src/xml src/xmlpatterns \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/gui src/multimedia src/network \ + src/opengl src/openvg src/phonon src/qt3support \ + src/s60installs src/s60main src/script src/scripttools \ + src/sql src/svg src/testlib src/tools src/winmain src/xml \ + src/xmlpatterns src/3rdparty/freetype src/3rdparty/libjpeg \ + src/3rdparty/libmng src/3rdparty/libpng src/3rdparty/libtiff \ + src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/tools/assistant/lib/fulltextsearch -CONFIGURE_WRKSRC=${WRKSRC}/../../../../ +BUILD_WRKSRC= ${WRKSRC}/tools/assistant/lib/fulltextsearch +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} - ${MKDIR} ${WRKSRC}/../../../../mkspecs - ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../../bin/qmake + ${MKDIR} ${WRKSRC}/mkspecs + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake post-configure: ${REINPLACE_CMD} \ -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' \ -e 's|-fno-exceptions ||g' \ - ${WRKSRC}/Makefile + ${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/QtCLucene.pc + ${WRKSRC}/lib/pkgconfig/QtCLucene.pc .include <bsd.port.mk> diff --git a/textproc/qt4-clucene/pkg-descr b/textproc/qt4-clucene/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/textproc/qt4-clucene/pkg-descr +++ b/textproc/qt4-clucene/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/textproc/qt4-clucene/pkg-plist b/textproc/qt4-clucene/pkg-plist index 06ca6436ba2f..dfcdd838c13d 100644 --- a/textproc/qt4-clucene/pkg-plist +++ b/textproc/qt4-clucene/pkg-plist @@ -6,3 +6,4 @@ lib/qt4/libQtCLucene.so.%%SHLIB_SHVER%% lib/qt4/libQtCLucene.so.%%SHLIB_VER%% %%DEBUG%%lib/qt4/libQtCLucene.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtCLucene.pc +@dirrmtry lib/qt4 diff --git a/textproc/qt4-xml/Makefile b/textproc/qt4-xml/Makefile index a7101944e51b..2285b6f33a91 100644 --- a/textproc/qt4-xml/Makefile +++ b/textproc/qt4-xml/Makefile @@ -8,7 +8,6 @@ PORTNAME= xml PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= textproc PKGNAMEPREFIX= qt4- @@ -30,30 +29,40 @@ 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/gui 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/activeqt src/dbus src/gui src/multimedia src/network \ + src/opengl src/openvg src/phonon src/qt3support \ + src/s60installs src/s60main src/script src/scripttools src/sql \ + src/svg src/testlib src/tools src/winmain src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../ +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EPATCH= extrapatch-src-xml-Makefile + +SUB_LIST+= WRKSRC=${WRKSRC:S|//|/|} 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 + ${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 + -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' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ - ${WRKSRC}/../../lib/pkgconfig/QtXml.pc + ${WRKSRC}/lib/pkgconfig/QtXml.pc +#disable installation of include/Qt/qxmlstream.h, it handled by qt-corelib package + @${SED} ${_SUB_LIST_TEMP} ${FILESDIR}/${EPATCH} > ${WRKDIR}/${EPATCH} + ${PATCH} -d ${WRKSRC} < ${WRKDIR}/${EPATCH} .include <bsd.port.mk> diff --git a/textproc/qt4-xml/files/extrapatch-src-xml-Makefile b/textproc/qt4-xml/files/extrapatch-src-xml-Makefile new file mode 100644 index 000000000000..f47416234370 --- /dev/null +++ b/textproc/qt4-xml/files/extrapatch-src-xml-Makefile @@ -0,0 +1,17 @@ +--- src/xml/Makefile.orig 2009-12-04 16:04:02.944271152 +1000 ++++ src/xml/Makefile 2009-12-04 16:07:07.986728782 +1000 +@@ -533,14 +533,12 @@ + @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/include/qt4/Qt/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/include/qt4/Qt/ + -$(INSTALL_PROGRAM) %%WRKSRC%%/src/xml/sax/qxml.h $(INSTALL_ROOT)/usr/local/include/qt4/Qt/ + -$(INSTALL_PROGRAM) %%WRKSRC%%/src/xml/dom/qdom.h $(INSTALL_ROOT)/usr/local/include/qt4/Qt/ +- -$(INSTALL_PROGRAM) %%WRKSRC%%/src/xml/stream/qxmlstream.h $(INSTALL_ROOT)/usr/local/include/qt4/Qt/ + -$(INSTALL_PROGRAM) %%WRKSRC%%/include/QtXml/QtXml $(INSTALL_ROOT)/usr/local/include/qt4/Qt/ + + + uninstall_flat_headers: FORCE + -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/include/qt4/Qt/qxml.h + -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/include/qt4/Qt/qdom.h +- -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/include/qt4/Qt/qxmlstream.h + -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/include/qt4/Qt/QtXml + -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/include/qt4/Qt/ + diff --git a/textproc/qt4-xml/pkg-descr b/textproc/qt4-xml/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/textproc/qt4-xml/pkg-descr +++ b/textproc/qt4-xml/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/textproc/qt4-xml/pkg-plist b/textproc/qt4-xml/pkg-plist index d6dbd7ec940f..67e88d64dee1 100644 --- a/textproc/qt4-xml/pkg-plist +++ b/textproc/qt4-xml/pkg-plist @@ -56,6 +56,7 @@ lib/qt4/libQtXml.so.%%SHLIB_SHVER%% lib/qt4/libQtXml.so.%%SHLIB_VER%% %%DEBUG%%lib/qt4/libQtXml.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtXml.pc +@dirrmtry lib/qt4 @dirrm include/qt4/QtXml @dirrmtry include/qt4/Qt @dirrmtry include/qt4 diff --git a/textproc/qt4-xmlpatterns-tool/Makefile b/textproc/qt4-xmlpatterns-tool/Makefile index cb2c058a65a4..8caa3c9e7419 100644 --- a/textproc/qt4-xmlpatterns-tool/Makefile +++ b/textproc/qt4-xmlpatterns-tool/Makefile @@ -27,23 +27,27 @@ 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/gui src/network src/opengl src/phonon \ - src/qt3support src/script src/sql src/svg src/testlib \ - src/tools src/xml src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/gui src/multimedia src/network \ + src/opengl src/openvg src/phonon src/qt3support \ + src/s60installs src/s60main src/script src/scripttools \ + src/sql src/svg src/testlib src/tools src/winmain src/xml \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/tools/xmlpatterns -CONFIGURE_WRKSRC=${WRKSRC}/../../ +BUILD_WRKSRC= ${WRKSRC}/tools/xmlpatterns +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} - ${MKDIR} ${WRKSRC}/../../mkspecs + ${MKDIR} ${WRKSRC}/mkspecs # ${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=xmlpatterns|g' \ -# ${WRKSRC}/xmlpatterns.pro - ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake +# ${BUILD_WRKSRC}/xmlpatterns.pro + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake .include <bsd.port.mk> diff --git a/textproc/qt4-xmlpatterns-tool/pkg-descr b/textproc/qt4-xmlpatterns-tool/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/textproc/qt4-xmlpatterns-tool/pkg-descr +++ b/textproc/qt4-xmlpatterns-tool/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/textproc/qt4-xmlpatterns/Makefile b/textproc/qt4-xmlpatterns/Makefile index 417d81d0c5b3..1319a4d228c4 100644 --- a/textproc/qt4-xmlpatterns/Makefile +++ b/textproc/qt4-xmlpatterns/Makefile @@ -14,7 +14,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= XQuery 1.0 and XPath 2.0 support for Qt4 USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build corelib network +QT_COMPONENTS= qmake_build moc_build rcc_build corelib network QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_SAFE= yes @@ -28,32 +28,37 @@ 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/gui src/opengl src/phonon \ - src/qt3support src/script src/sql src/svg src/testlib \ - src/tools src/xml src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/gui src/multimedia src/opengl \ + src/openvg src/phonon src/qt3support src/s60installs \ + src/s60main src/script src/scripttools src/sql src/svg \ + src/testlib src/tools src/winmain src/3rdparty/clucene \ + src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ + src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ + src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../ +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-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 + ${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' \ -e 's|-fno-exceptions ||g' \ - ${WRKSRC}/Makefile + ${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/QtXmlPatterns.pc + ${WRKSRC}/lib/pkgconfig/QtXmlPatterns.pc .include <bsd.port.mk> diff --git a/textproc/qt4-xmlpatterns/pkg-descr b/textproc/qt4-xmlpatterns/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/textproc/qt4-xmlpatterns/pkg-descr +++ b/textproc/qt4-xmlpatterns/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/textproc/qt4-xmlpatterns/pkg-plist b/textproc/qt4-xmlpatterns/pkg-plist index 26009f8d845d..5208eaa1668b 100644 --- a/textproc/qt4-xmlpatterns/pkg-plist +++ b/textproc/qt4-xmlpatterns/pkg-plist @@ -10,6 +10,8 @@ include/qt4/Qt/qxmlname.h include/qt4/Qt/qxmlnamepool.h include/qt4/Qt/qxmlquery.h include/qt4/Qt/qxmlresultitems.h +include/qt4/Qt/qxmlschema.h +include/qt4/Qt/qxmlschemavalidator.h include/qt4/Qt/qxmlserializer.h include/qt4/QtXmlPatterns/QAbstractMessageHandler include/qt4/QtXmlPatterns/QAbstractUriResolver @@ -24,6 +26,8 @@ include/qt4/QtXmlPatterns/QXmlNamePool include/qt4/QtXmlPatterns/QXmlNodeModelIndex include/qt4/QtXmlPatterns/QXmlQuery include/qt4/QtXmlPatterns/QXmlResultItems +include/qt4/QtXmlPatterns/QXmlSchema +include/qt4/QtXmlPatterns/QXmlSchemaValidator include/qt4/QtXmlPatterns/QXmlSerializer include/qt4/QtXmlPatterns/QtXmlPatterns include/qt4/QtXmlPatterns/qabstractmessagehandler.h @@ -37,6 +41,8 @@ include/qt4/QtXmlPatterns/qxmlname.h include/qt4/QtXmlPatterns/qxmlnamepool.h include/qt4/QtXmlPatterns/qxmlquery.h include/qt4/QtXmlPatterns/qxmlresultitems.h +include/qt4/QtXmlPatterns/qxmlschema.h +include/qt4/QtXmlPatterns/qxmlschemavalidator.h include/qt4/QtXmlPatterns/qxmlserializer.h lib/qt4/libQtXmlPatterns.la lib/qt4/libQtXmlPatterns.prl @@ -46,5 +52,7 @@ lib/qt4/libQtXmlPatterns.so.%%SHLIB_SHVER%% lib/qt4/libQtXmlPatterns.so.%%SHLIB_VER%% %%DEBUG%%lib/qt4/libQtXmlPatterns.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtXmlPatterns.pc +@dirrmtry lib/qt4 @dirrm include/qt4/QtXmlPatterns @dirrmtry include/qt4/Qt +@dirrmtry include/qt4 diff --git a/www/qt4-webkit/Makefile b/www/qt4-webkit/Makefile index d4790bc40336..cee79f5286bd 100644 --- a/www/qt4-webkit/Makefile +++ b/www/qt4-webkit/Makefile @@ -11,11 +11,11 @@ CATEGORIES?= www PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org -COMMENT= Qt4 webkit engine +COMMENT= Qt4 WebKit engine USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build rcc_build corelib gui network xml \ - dbus phonon phonon-gst + dbus phonon phonon-gst script scripttools xmlpatterns QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_SAFE= yes @@ -26,36 +26,40 @@ 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 + PATH=${WRKSRC}/bin:$$PATH MAKEOBJDIR=. DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ - src/opengl \ - src/qt3support src/sql src/svg src/testlib \ - src/tools src/xmlpatterns src/3rdparty/clucene + src/activeqt src/dbus src/multimedia src/opengl src/openvg \ + src/qt3support src/s60installs src/s60main src/scripttools \ + src/sql src/svg src/testlib src/tools src/winmain \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/3rdparty/${PORTNAME}/WebCore -CONFIGURE_WRKSRC=${WRKSRC}/../../../../ +BUILD_WRKSRC= ${WRKSRC}/src/3rdparty/${PORTNAME}/WebCore +INSTALL_WRKSRC= ${BUILD_WRKSRC} CONFIGURE_ARGS+= -I../../../../include/Qt -I../../../../include +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-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 - ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../../../bin/rcc + ${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' \ - ${WRKSRC}/Makefile + ${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/QtWebKit.pc + ${WRKSRC}/lib/pkgconfig/QtWebKit.pc .include <bsd.port.mk> diff --git a/www/qt4-webkit/files/patch-JavaScriptCore-wtf-Threading.h b/www/qt4-webkit/files/patch-JavaScriptCore-wtf-Threading.h deleted file mode 100644 index 53e2c5f1ec03..000000000000 --- a/www/qt4-webkit/files/patch-JavaScriptCore-wtf-Threading.h +++ /dev/null @@ -1,31 +0,0 @@ ---- ../JavaScriptCore/wtf/Threading.h.orig 2009-05-07 07:06:48.000000000 +0000 -+++ ../JavaScriptCore/wtf/Threading.h 2009-05-07 08:00:22.000000000 +0000 -@@ -196,8 +196,8 @@ - #elif COMPILER(GCC) - #define WTF_USE_LOCKFREE_THREADSAFESHARED 1 - --inline void atomicIncrement(int volatile* addend) { __gnu_cxx::__atomic_add(addend, 1); } --inline int atomicDecrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; } -+inline void atomicIncrement(_Atomic_word volatile* addend) { __gnu_cxx::__atomic_add(addend, 1); } -+inline int atomicDecrement(_Atomic_word volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; } - - #endif - -@@ -211,7 +211,7 @@ - void ref() - { - #if USE(LOCKFREE_THREADSAFESHARED) -- atomicIncrement(&m_refCount); -+ atomicIncrement((_Atomic_word *)&m_refCount); - #else - MutexLocker locker(m_mutex); - ++m_refCount; -@@ -221,7 +221,7 @@ - void deref() - { - #if USE(LOCKFREE_THREADSAFESHARED) -- if (atomicDecrement(&m_refCount) <= 0) -+ if (atomicDecrement((_Atomic_word *)&m_refCount) <= 0) - #else - { - MutexLocker locker(m_mutex);
\ No newline at end of file diff --git a/www/qt4-webkit/pkg-descr b/www/qt4-webkit/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/www/qt4-webkit/pkg-descr +++ b/www/qt4-webkit/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/www/qt4-webkit/pkg-plist b/www/qt4-webkit/pkg-plist index 748148fc5324..9c8cb8f7b230 100644 --- a/www/qt4-webkit/pkg-plist +++ b/www/qt4-webkit/pkg-plist @@ -1,34 +1,46 @@ -include/qt4/Qt/qwebframe.h +include/qt4/Qt/QtWebKit +include/qt4/Qt/qgraphicswebview.h include/qt4/Qt/qwebdatabase.h -include/qt4/Qt/qwebsecurityorigin.h +include/qt4/Qt/qwebelement.h +include/qt4/Qt/qwebframe.h include/qt4/Qt/qwebhistory.h include/qt4/Qt/qwebhistoryinterface.h +include/qt4/Qt/qwebinspector.h include/qt4/Qt/qwebkitglobal.h +include/qt4/Qt/qwebkitversion.h include/qt4/Qt/qwebpage.h include/qt4/Qt/qwebpluginfactory.h +include/qt4/Qt/qwebsecurityorigin.h include/qt4/Qt/qwebsettings.h include/qt4/Qt/qwebview.h -include/qt4/Qt/QtWebKit +include/qt4/QtWebKit/QGraphicsWebView +include/qt4/QtWebKit/QWebDatabase +include/qt4/QtWebKit/QWebElement +include/qt4/QtWebKit/QWebElementCollection include/qt4/QtWebKit/QWebFrame include/qt4/QtWebKit/QWebHistory include/qt4/QtWebKit/QWebHistoryInterface include/qt4/QtWebKit/QWebHistoryItem include/qt4/QtWebKit/QWebHitTestResult +include/qt4/QtWebKit/QWebInspector include/qt4/QtWebKit/QWebPage include/qt4/QtWebKit/QWebPluginFactory +include/qt4/QtWebKit/QWebSecurityOrigin include/qt4/QtWebKit/QWebSettings -include/qt4/QtWebKit/QWebDatabase include/qt4/QtWebKit/QWebView include/qt4/QtWebKit/QtWebKit -include/qt4/QtWebKit/QWebSecurityOrigin -include/qt4/QtWebKit/qwebframe.h +include/qt4/QtWebKit/qgraphicswebview.h include/qt4/QtWebKit/qwebdatabase.h -include/qt4/QtWebKit/qwebsecurityorigin.h +include/qt4/QtWebKit/qwebelement.h +include/qt4/QtWebKit/qwebframe.h include/qt4/QtWebKit/qwebhistory.h include/qt4/QtWebKit/qwebhistoryinterface.h +include/qt4/QtWebKit/qwebinspector.h include/qt4/QtWebKit/qwebkitglobal.h +include/qt4/QtWebKit/qwebkitversion.h include/qt4/QtWebKit/qwebpage.h include/qt4/QtWebKit/qwebpluginfactory.h +include/qt4/QtWebKit/qwebsecurityorigin.h include/qt4/QtWebKit/qwebsettings.h include/qt4/QtWebKit/qwebview.h lib/qt4/libQtWebKit.la @@ -39,6 +51,7 @@ lib/qt4/libQtWebKit.so.%%SHLIB_SHVER%% lib/qt4/libQtWebKit.so.%%SHLIB_VER%% @comment %%DEBUG%%lib/qt4/libQtWebKit.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtWebKit.pc +@dirrmtry lib/qt4 @dirrm include/qt4/QtWebKit @dirrmtry include/qt4/Qt @dirrmtry include/qt4 diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile index f2ef6a434633..057936b982ad 100644 --- a/x11-toolkits/qt4-gui/Makefile +++ b/x11-toolkits/qt4-gui/Makefile @@ -8,7 +8,6 @@ PORTNAME= gui PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= x11-toolkits PKGNAMEPREFIX= qt4- @@ -37,21 +36,25 @@ 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/script src/sql src/svg src/testlib \ - src/tools src/xml src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/multimedia src/network src/opengl \ + src/openvg src/phonon src/qt3support src/s60installs \ + src/s60main src/script src/scripttools src/sql src/svg \ + src/testlib src/tools src/winmain src/xml src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../ -PATCH_WRKSRC=${CONFIGURE_WRKSRC} +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} CONFIGURE_ARGS+= -I../../include/Qt -I../../include +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure + FONTSCALE= ${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf FONTENCOD= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir @@ -82,19 +85,18 @@ RUN_DEPENDS+= ${FONTSCALE}:${X_FONTS_TTF_PORT} \ .endif 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 - ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc - ${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/../../bin/uic + ${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 + ${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/bin/uic post-configure: ${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ - -e 's|.*$$(QMAKE).*||g' ${WRKSRC}/Makefile + -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' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ - ${WRKSRC}/../../lib/pkgconfig/QtGui.pc + ${WRKSRC}/lib/pkgconfig/QtGui.pc .include <bsd.port.mk> diff --git a/x11-toolkits/qt4-gui/pkg-descr b/x11-toolkits/qt4-gui/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/x11-toolkits/qt4-gui/pkg-descr +++ b/x11-toolkits/qt4-gui/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/x11-toolkits/qt4-gui/pkg-plist b/x11-toolkits/qt4-gui/pkg-plist index 613cdd5ca955..a2bac7ea6233 100644 --- a/x11-toolkits/qt4-gui/pkg-plist +++ b/x11-toolkits/qt4-gui/pkg-plist @@ -1,5 +1,6 @@ include/qt4/Qt/QtGui include/qt4/Qt/qabstractbutton.h +include/qt4/Qt/qabstractfontengine_qws.h include/qt4/Qt/qabstractitemdelegate.h include/qt4/Qt/qabstractitemview.h include/qt4/Qt/qabstractpagesetupdialog.h @@ -35,14 +36,22 @@ include/qt4/Qt/qcombobox.h include/qt4/Qt/qcommandlinkbutton.h include/qt4/Qt/qcommonstyle.h include/qt4/Qt/qcompleter.h +include/qt4/Qt/qcopchannel_qws.h include/qt4/Qt/qcursor.h include/qt4/Qt/qdatawidgetmapper.h include/qt4/Qt/qdatetimeedit.h +include/qt4/Qt/qdecoration_qws.h +include/qt4/Qt/qdecorationdefault_qws.h +include/qt4/Qt/qdecorationfactory_qws.h +include/qt4/Qt/qdecorationplugin_qws.h +include/qt4/Qt/qdecorationstyled_qws.h +include/qt4/Qt/qdecorationwindows_qws.h include/qt4/Qt/qdesktopservices.h include/qt4/Qt/qdesktopwidget.h include/qt4/Qt/qdial.h include/qt4/Qt/qdialog.h include/qt4/Qt/qdialogbuttonbox.h +include/qt4/Qt/qdirectpainter_qws.h include/qt4/Qt/qdirmodel.h include/qt4/Qt/qdockwidget.h include/qt4/Qt/qdrag.h @@ -61,6 +70,11 @@ include/qt4/Qt/qfontinfo.h include/qt4/Qt/qfontmetrics.h include/qt4/Qt/qformlayout.h include/qt4/Qt/qframe.h +include/qt4/Qt/qgenericmatrix.h +include/qt4/Qt/qgesture.h +include/qt4/Qt/qgesturerecognizer.h +include/qt4/Qt/qgraphicsanchorlayout.h +include/qt4/Qt/qgraphicseffect.h include/qt4/Qt/qgraphicsgridlayout.h include/qt4/Qt/qgraphicsitem.h include/qt4/Qt/qgraphicsitemanimation.h @@ -70,11 +84,13 @@ include/qt4/Qt/qgraphicslinearlayout.h include/qt4/Qt/qgraphicsproxywidget.h include/qt4/Qt/qgraphicsscene.h include/qt4/Qt/qgraphicssceneevent.h +include/qt4/Qt/qgraphicstransform.h include/qt4/Qt/qgraphicsview.h include/qt4/Qt/qgraphicswidget.h include/qt4/Qt/qgridlayout.h include/qt4/Qt/qgroupbox.h include/qt4/Qt/qgtkstyle.h +include/qt4/Qt/qguifunctions_wince.h include/qt4/Qt/qheaderview.h include/qt4/Qt/qicon.h include/qt4/Qt/qiconengine.h @@ -90,6 +106,15 @@ include/qt4/Qt/qinputdialog.h include/qt4/Qt/qitemdelegate.h include/qt4/Qt/qitemeditorfactory.h include/qt4/Qt/qitemselectionmodel.h +include/qt4/Qt/qkbd_qws.h +include/qt4/Qt/qkbddriverfactory_qws.h +include/qt4/Qt/qkbddriverplugin_qws.h +include/qt4/Qt/qkbdlinuxinput_qws.h +include/qt4/Qt/qkbdqnx_qws.h +include/qt4/Qt/qkbdtty_qws.h +include/qt4/Qt/qkbdum_qws.h +include/qt4/Qt/qkbdvfb_qws.h +include/qt4/Qt/qkeyeventtransition.h include/qt4/Qt/qkeysequence.h include/qt4/Qt/qlabel.h include/qt4/Qt/qlayout.h @@ -98,8 +123,13 @@ include/qt4/Qt/qlcdnumber.h include/qt4/Qt/qlineedit.h include/qt4/Qt/qlistview.h include/qt4/Qt/qlistwidget.h +include/qt4/Qt/qmaccocoaviewcontainer_mac.h +include/qt4/Qt/qmacdefines_mac.h +include/qt4/Qt/qmacnativewidget_mac.h +include/qt4/Qt/qmacstyle_mac.h include/qt4/Qt/qmainwindow.h include/qt4/Qt/qmatrix.h +include/qt4/Qt/qmatrix4x4.h include/qt4/Qt/qmdiarea.h include/qt4/Qt/qmdisubwindow.h include/qt4/Qt/qmenu.h @@ -108,6 +138,16 @@ include/qt4/Qt/qmenudata.h include/qt4/Qt/qmessagebox.h include/qt4/Qt/qmime.h include/qt4/Qt/qmotifstyle.h +include/qt4/Qt/qmouse_qws.h +include/qt4/Qt/qmousedriverfactory_qws.h +include/qt4/Qt/qmousedriverplugin_qws.h +include/qt4/Qt/qmouseeventtransition.h +include/qt4/Qt/qmouselinuxinput_qws.h +include/qt4/Qt/qmouselinuxtp_qws.h +include/qt4/Qt/qmousepc_qws.h +include/qt4/Qt/qmouseqnx_qws.h +include/qt4/Qt/qmousetslib_qws.h +include/qt4/Qt/qmousevfb_qws.h include/qt4/Qt/qmovie.h include/qt4/Qt/qpagesetupdialog.h include/qt4/Qt/qpaintdevice.h @@ -132,11 +172,25 @@ include/qt4/Qt/qprintpreviewwidget.h include/qt4/Qt/qprogressbar.h include/qt4/Qt/qprogressdialog.h include/qt4/Qt/qproxymodel.h +include/qt4/Qt/qproxystyle.h include/qt4/Qt/qpushbutton.h +include/qt4/Qt/qquaternion.h include/qt4/Qt/qradiobutton.h include/qt4/Qt/qregion.h include/qt4/Qt/qrgb.h include/qt4/Qt/qrubberband.h +include/qt4/Qt/qs60mainapplication.h +include/qt4/Qt/qs60mainappui.h +include/qt4/Qt/qs60maindocument.h +include/qt4/Qt/qs60style.h +include/qt4/Qt/qscreen_qws.h +include/qt4/Qt/qscreendriverfactory_qws.h +include/qt4/Qt/qscreendriverplugin_qws.h +include/qt4/Qt/qscreenlinuxfb_qws.h +include/qt4/Qt/qscreenproxy_qws.h +include/qt4/Qt/qscreenqnx_qws.h +include/qt4/Qt/qscreentransformed_qws.h +include/qt4/Qt/qscreenvfb_qws.h include/qt4/Qt/qscrollarea.h include/qt4/Qt/qscrollbar.h include/qt4/Qt/qsessionmanager.h @@ -146,6 +200,7 @@ include/qt4/Qt/qsizepolicy.h include/qt4/Qt/qslider.h include/qt4/Qt/qsortfilterproxymodel.h include/qt4/Qt/qsound.h +include/qt4/Qt/qsoundqss_qws.h include/qt4/Qt/qspinbox.h include/qt4/Qt/qsplashscreen.h include/qt4/Qt/qsplitter.h @@ -160,6 +215,7 @@ include/qt4/Qt/qstylefactory.h include/qt4/Qt/qstyleoption.h include/qt4/Qt/qstylepainter.h include/qt4/Qt/qstyleplugin.h +include/qt4/Qt/qsymbianevent.h include/qt4/Qt/qsyntaxhighlighter.h include/qt4/Qt/qsystemtrayicon.h include/qt4/Qt/qtabbar.h @@ -183,6 +239,8 @@ include/qt4/Qt/qtoolbox.h include/qt4/Qt/qtoolbutton.h include/qt4/Qt/qtooltip.h include/qt4/Qt/qtransform.h +include/qt4/Qt/qtransportauth_qws.h +include/qt4/Qt/qtransportauthdefs_qws.h include/qt4/Qt/qtreeview.h include/qt4/Qt/qtreewidget.h include/qt4/Qt/qtreewidgetitemiterator.h @@ -190,21 +248,37 @@ include/qt4/Qt/qundogroup.h include/qt4/Qt/qundostack.h include/qt4/Qt/qundoview.h include/qt4/Qt/qvalidator.h +include/qt4/Qt/qvector2d.h +include/qt4/Qt/qvector3d.h +include/qt4/Qt/qvector4d.h +include/qt4/Qt/qvfbhdr.h include/qt4/Qt/qwhatsthis.h include/qt4/Qt/qwidget.h include/qt4/Qt/qwidgetaction.h include/qt4/Qt/qwindowdefs.h +include/qt4/Qt/qwindowdefs_win.h include/qt4/Qt/qwindowscestyle.h include/qt4/Qt/qwindowsmobilestyle.h include/qt4/Qt/qwindowsstyle.h include/qt4/Qt/qwindowsvistastyle.h include/qt4/Qt/qwindowsxpstyle.h +include/qt4/Qt/qwindowsystem_qws.h include/qt4/Qt/qwizard.h include/qt4/Qt/qwmatrix.h include/qt4/Qt/qworkspace.h +include/qt4/Qt/qwscursor_qws.h +include/qt4/Qt/qwsdisplay_qws.h +include/qt4/Qt/qwsembedwidget.h +include/qt4/Qt/qwsevent_qws.h +include/qt4/Qt/qwsmanager_qws.h +include/qt4/Qt/qwsproperty_qws.h +include/qt4/Qt/qwsprotocolitem_qws.h +include/qt4/Qt/qwssocket_qws.h +include/qt4/Qt/qwsutils_qws.h include/qt4/Qt/qx11embed_x11.h include/qt4/Qt/qx11info_x11.h include/qt4/QtGui/QAbstractButton +include/qt4/QtGui/QAbstractFontEngine include/qt4/QtGui/QAbstractGraphicsShapeItem include/qt4/QtGui/QAbstractItemDelegate include/qt4/QtGui/QAbstractItemView @@ -218,6 +292,7 @@ include/qt4/QtGui/QAbstractTextDocumentLayout include/qt4/QtGui/QAbstractUndoItem include/qt4/QtGui/QAccessible include/qt4/QtGui/QAccessible2Interface +include/qt4/QtGui/QAccessibleActionInterface include/qt4/QtGui/QAccessibleApplication include/qt4/QtGui/QAccessibleBridge include/qt4/QtGui/QAccessibleBridgeFactoryInterface @@ -225,6 +300,7 @@ include/qt4/QtGui/QAccessibleBridgePlugin include/qt4/QtGui/QAccessibleEditableTextInterface include/qt4/QtGui/QAccessibleEvent include/qt4/QtGui/QAccessibleFactoryInterface +include/qt4/QtGui/QAccessibleImageInterface include/qt4/QtGui/QAccessibleInterface include/qt4/QtGui/QAccessibleInterfaceEx include/qt4/QtGui/QAccessibleObject @@ -240,6 +316,7 @@ include/qt4/QtGui/QAction include/qt4/QtGui/QActionEvent include/qt4/QtGui/QActionGroup include/qt4/QtGui/QApplication +include/qt4/QtGui/QAuthDevice include/qt4/QtGui/QBitmap include/qt4/QtGui/QBoxLayout include/qt4/QtGui/QBrush @@ -263,17 +340,27 @@ include/qt4/QtGui/QCommonStyle include/qt4/QtGui/QCompleter include/qt4/QtGui/QConicalGradient include/qt4/QtGui/QContextMenuEvent +include/qt4/QtGui/QCopChannel include/qt4/QtGui/QCursor include/qt4/QtGui/QCursorShape include/qt4/QtGui/QDataWidgetMapper include/qt4/QtGui/QDateEdit include/qt4/QtGui/QDateTimeEdit +include/qt4/QtGui/QDecoration +include/qt4/QtGui/QDecorationAction +include/qt4/QtGui/QDecorationDefault +include/qt4/QtGui/QDecorationFactory +include/qt4/QtGui/QDecorationFactoryInterface +include/qt4/QtGui/QDecorationPlugin +include/qt4/QtGui/QDecorationStyled +include/qt4/QtGui/QDecorationWindows include/qt4/QtGui/QDesktopServices include/qt4/QtGui/QDesktopWidget include/qt4/QtGui/QDial include/qt4/QtGui/QDialog include/qt4/QtGui/QDialogButtonBox include/qt4/QtGui/QDirModel +include/qt4/QtGui/QDirectPainter include/qt4/QtGui/QDockWidget include/qt4/QtGui/QDoubleSpinBox include/qt4/QtGui/QDoubleValidator @@ -294,14 +381,27 @@ include/qt4/QtGui/QFont include/qt4/QtGui/QFontComboBox include/qt4/QtGui/QFontDatabase include/qt4/QtGui/QFontDialog +include/qt4/QtGui/QFontEngineFactoryInterface +include/qt4/QtGui/QFontEngineInfo +include/qt4/QtGui/QFontEnginePlugin include/qt4/QtGui/QFontInfo include/qt4/QtGui/QFontMetrics include/qt4/QtGui/QFontMetricsF include/qt4/QtGui/QFormLayout include/qt4/QtGui/QFrame +include/qt4/QtGui/QGenericMatrix +include/qt4/QtGui/QGesture +include/qt4/QtGui/QGestureEvent +include/qt4/QtGui/QGestureRecognizer include/qt4/QtGui/QGradient include/qt4/QtGui/QGradientStop include/qt4/QtGui/QGradientStops +include/qt4/QtGui/QGraphicsAnchor +include/qt4/QtGui/QGraphicsAnchorLayout +include/qt4/QtGui/QGraphicsBlurEffect +include/qt4/QtGui/QGraphicsColorizeEffect +include/qt4/QtGui/QGraphicsDropShadowEffect +include/qt4/QtGui/QGraphicsEffect include/qt4/QtGui/QGraphicsEllipseItem include/qt4/QtGui/QGraphicsGridLayout include/qt4/QtGui/QGraphicsItem @@ -311,11 +411,15 @@ include/qt4/QtGui/QGraphicsLayout include/qt4/QtGui/QGraphicsLayoutItem include/qt4/QtGui/QGraphicsLineItem include/qt4/QtGui/QGraphicsLinearLayout +include/qt4/QtGui/QGraphicsObject +include/qt4/QtGui/QGraphicsOpacityEffect include/qt4/QtGui/QGraphicsPathItem include/qt4/QtGui/QGraphicsPixmapItem include/qt4/QtGui/QGraphicsPolygonItem include/qt4/QtGui/QGraphicsProxyWidget include/qt4/QtGui/QGraphicsRectItem +include/qt4/QtGui/QGraphicsRotation +include/qt4/QtGui/QGraphicsScale include/qt4/QtGui/QGraphicsScene include/qt4/QtGui/QGraphicsSceneContextMenuEvent include/qt4/QtGui/QGraphicsSceneDragDropEvent @@ -328,6 +432,7 @@ include/qt4/QtGui/QGraphicsSceneResizeEvent include/qt4/QtGui/QGraphicsSceneWheelEvent include/qt4/QtGui/QGraphicsSimpleTextItem include/qt4/QtGui/QGraphicsTextItem +include/qt4/QtGui/QGraphicsTransform include/qt4/QtGui/QGraphicsView include/qt4/QtGui/QGraphicsWidget include/qt4/QtGui/QGridLayout @@ -369,7 +474,10 @@ include/qt4/QtGui/QItemEditorFactory include/qt4/QtGui/QItemSelection include/qt4/QtGui/QItemSelectionModel include/qt4/QtGui/QItemSelectionRange +include/qt4/QtGui/QKbdDriverFactory +include/qt4/QtGui/QKbdDriverPlugin include/qt4/QtGui/QKeyEvent +include/qt4/QtGui/QKeyEventTransition include/qt4/QtGui/QKeySequence include/qt4/QtGui/QLCDNumber include/qt4/QtGui/QLabel @@ -378,13 +486,27 @@ include/qt4/QtGui/QLayoutItem include/qt4/QtGui/QLayoutIterator include/qt4/QtGui/QLineEdit include/qt4/QtGui/QLinearGradient +include/qt4/QtGui/QLinuxFbScreen +include/qt4/QtGui/QLinuxFb_Shared include/qt4/QtGui/QListView include/qt4/QtGui/QListWidget include/qt4/QtGui/QListWidgetItem +include/qt4/QtGui/QMacCocoaViewContainer include/qt4/QtGui/QMacMime +include/qt4/QtGui/QMacNativeWidget include/qt4/QtGui/QMacPasteboardMime +include/qt4/QtGui/QMacStyle include/qt4/QtGui/QMainWindow include/qt4/QtGui/QMatrix +include/qt4/QtGui/QMatrix2x2 +include/qt4/QtGui/QMatrix2x3 +include/qt4/QtGui/QMatrix2x4 +include/qt4/QtGui/QMatrix3x2 +include/qt4/QtGui/QMatrix3x3 +include/qt4/QtGui/QMatrix3x4 +include/qt4/QtGui/QMatrix4x2 +include/qt4/QtGui/QMatrix4x3 +include/qt4/QtGui/QMatrix4x4 include/qt4/QtGui/QMdiArea include/qt4/QtGui/QMdiSubWindow include/qt4/QtGui/QMenu @@ -394,7 +516,10 @@ include/qt4/QtGui/QMenubarUpdatedEvent include/qt4/QtGui/QMessageBox include/qt4/QtGui/QMimeSource include/qt4/QtGui/QMotifStyle +include/qt4/QtGui/QMouseDriverFactory +include/qt4/QtGui/QMouseDriverPlugin include/qt4/QtGui/QMouseEvent +include/qt4/QtGui/QMouseEventTransition include/qt4/QtGui/QMoveEvent include/qt4/QtGui/QMovie include/qt4/QtGui/QPageSetupDialog @@ -407,11 +532,13 @@ include/qt4/QtGui/QPainterPath include/qt4/QtGui/QPainterPathPrivate include/qt4/QtGui/QPainterPathStroker include/qt4/QtGui/QPalette +include/qt4/QtGui/QPanGesture include/qt4/QtGui/QPen include/qt4/QtGui/QPicture include/qt4/QtGui/QPictureFormatInterface include/qt4/QtGui/QPictureFormatPlugin include/qt4/QtGui/QPictureIO +include/qt4/QtGui/QPinchGesture include/qt4/QtGui/QPixmap include/qt4/QtGui/QPixmapCache include/qt4/QtGui/QPlainTextDocumentLayout @@ -419,6 +546,7 @@ include/qt4/QtGui/QPlainTextEdit include/qt4/QtGui/QPlastiqueStyle include/qt4/QtGui/QPolygon include/qt4/QtGui/QPolygonF +include/qt4/QtGui/QPoolEntry include/qt4/QtGui/QPrintDialog include/qt4/QtGui/QPrintEngine include/qt4/QtGui/QPrintPreviewDialog @@ -428,7 +556,13 @@ include/qt4/QtGui/QPrinterInfo include/qt4/QtGui/QProgressBar include/qt4/QtGui/QProgressDialog include/qt4/QtGui/QProxyModel +include/qt4/QtGui/QProxyScreen +include/qt4/QtGui/QProxyScreenCursor +include/qt4/QtGui/QProxyStyle include/qt4/QtGui/QPushButton +include/qt4/QtGui/QQnxMouseHandler +include/qt4/QtGui/QQnxScreen +include/qt4/QtGui/QQuaternion include/qt4/QtGui/QRadialGradient include/qt4/QtGui/QRadioButton include/qt4/QtGui/QRegExpValidator @@ -436,6 +570,15 @@ include/qt4/QtGui/QRegion include/qt4/QtGui/QResizeEvent include/qt4/QtGui/QRgb include/qt4/QtGui/QRubberBand +include/qt4/QtGui/QS60MainAppUi +include/qt4/QtGui/QS60MainApplication +include/qt4/QtGui/QS60MainDocument +include/qt4/QtGui/QS60Style +include/qt4/QtGui/QScreen +include/qt4/QtGui/QScreenCursor +include/qt4/QtGui/QScreenDriverFactory +include/qt4/QtGui/QScreenDriverFactoryInterface +include/qt4/QtGui/QScreenDriverPlugin include/qt4/QtGui/QScrollArea include/qt4/QtGui/QScrollBar include/qt4/QtGui/QSessionManager @@ -495,6 +638,7 @@ include/qt4/QtGui/QStyleOptionTabBarBaseV2 include/qt4/QtGui/QStyleOptionTabV2 include/qt4/QtGui/QStyleOptionTabV3 include/qt4/QtGui/QStyleOptionTabWidgetFrame +include/qt4/QtGui/QStyleOptionTabWidgetFrameV2 include/qt4/QtGui/QStyleOptionTitleBar include/qt4/QtGui/QStyleOptionToolBar include/qt4/QtGui/QStyleOptionToolBox @@ -507,6 +651,8 @@ include/qt4/QtGui/QStyleOptionViewItemV4 include/qt4/QtGui/QStylePainter include/qt4/QtGui/QStylePlugin include/qt4/QtGui/QStyledItemDelegate +include/qt4/QtGui/QSwipeGesture +include/qt4/QtGui/QSymbianEvent include/qt4/QtGui/QSyntaxHighlighter include/qt4/QtGui/QSystemTrayIcon include/qt4/QtGui/QTabBar @@ -516,6 +662,8 @@ include/qt4/QtGui/QTableWidget include/qt4/QtGui/QTableWidgetItem include/qt4/QtGui/QTableWidgetSelectionRange include/qt4/QtGui/QTabletEvent +include/qt4/QtGui/QTapGesture +include/qt4/QtGui/QTapAndHoldGesture include/qt4/QtGui/QTextBlock include/qt4/QtGui/QTextBlockFormat include/qt4/QtGui/QTextBlockGroup @@ -547,13 +695,17 @@ include/qt4/QtGui/QTextTable include/qt4/QtGui/QTextTableCell include/qt4/QtGui/QTextTableCellFormat include/qt4/QtGui/QTextTableFormat +include/qt4/QtGui/QTileRules include/qt4/QtGui/QTimeEdit include/qt4/QtGui/QToolBar include/qt4/QtGui/QToolBarChangeEvent include/qt4/QtGui/QToolBox include/qt4/QtGui/QToolButton include/qt4/QtGui/QToolTip +include/qt4/QtGui/QTouchEvent include/qt4/QtGui/QTransform +include/qt4/QtGui/QTransformedScreen +include/qt4/QtGui/QTransportAuth include/qt4/QtGui/QTreeView include/qt4/QtGui/QTreeWidget include/qt4/QtGui/QTreeWidgetItem @@ -565,8 +717,50 @@ include/qt4/QtGui/QUndoView include/qt4/QtGui/QUnixPrintWidget include/qt4/QtGui/QUpdateLaterEvent include/qt4/QtGui/QVBoxLayout +include/qt4/QtGui/QVFbHeader +include/qt4/QtGui/QVFbKeyData +include/qt4/QtGui/QVFbKeyboardHandler +include/qt4/QtGui/QVFbMouseHandler +include/qt4/QtGui/QVFbScreen include/qt4/QtGui/QValidator +include/qt4/QtGui/QVector2D +include/qt4/QtGui/QVector3D +include/qt4/QtGui/QVector4D include/qt4/QtGui/QWMatrix +include/qt4/QtGui/QWSCalibratedMouseHandler +include/qt4/QtGui/QWSClient +include/qt4/QtGui/QWSCursor +include/qt4/QtGui/QWSCursorMap +include/qt4/QtGui/QWSDisplay +include/qt4/QtGui/QWSEmbedWidget +include/qt4/QtGui/QWSEvent +include/qt4/QtGui/QWSInputMethod +include/qt4/QtGui/QWSInternalWindowInfo +include/qt4/QtGui/QWSKeyboardHandler +include/qt4/QtGui/QWSKeyboardHandlerFactoryInterface +include/qt4/QtGui/QWSLinuxInputKeyboardHandler +include/qt4/QtGui/QWSLinuxInputMouseHandler +include/qt4/QtGui/QWSLinuxTPMouseHandler +include/qt4/QtGui/QWSManager +include/qt4/QtGui/QWSMouseHandler +include/qt4/QtGui/QWSMouseHandlerFactoryInterface +include/qt4/QtGui/QWSPcMouseHandler +include/qt4/QtGui/QWSPointerCalibrationData +include/qt4/QtGui/QWSPropertyManager +include/qt4/QtGui/QWSProtocolItem +include/qt4/QtGui/QWSQnxKeyboardHandler +include/qt4/QtGui/QWSScreenSaver +include/qt4/QtGui/QWSServer +include/qt4/QtGui/QWSServerSocket +include/qt4/QtGui/QWSSocket +include/qt4/QtGui/QWSSoundClient +include/qt4/QtGui/QWSSoundServer +include/qt4/QtGui/QWSSoundServerSocket +include/qt4/QtGui/QWSTslibMouseHandler +include/qt4/QtGui/QWSTtyKeyboardHandler +include/qt4/QtGui/QWSUmKeyboardHandler +include/qt4/QtGui/QWSWindow +include/qt4/QtGui/QWSWindowInfo include/qt4/QtGui/QWhatsThis include/qt4/QtGui/QWhatsThisClickedEvent include/qt4/QtGui/QWheelEvent @@ -594,6 +788,7 @@ include/qt4/QtGui/QX11Info include/qt4/QtGui/QtEvents include/qt4/QtGui/QtGui include/qt4/QtGui/qabstractbutton.h +include/qt4/QtGui/qabstractfontengine_qws.h include/qt4/QtGui/qabstractitemdelegate.h include/qt4/QtGui/qabstractitemview.h include/qt4/QtGui/qabstractpagesetupdialog.h @@ -629,14 +824,22 @@ include/qt4/QtGui/qcombobox.h include/qt4/QtGui/qcommandlinkbutton.h include/qt4/QtGui/qcommonstyle.h include/qt4/QtGui/qcompleter.h +include/qt4/QtGui/qcopchannel_qws.h include/qt4/QtGui/qcursor.h include/qt4/QtGui/qdatawidgetmapper.h include/qt4/QtGui/qdatetimeedit.h +include/qt4/QtGui/qdecoration_qws.h +include/qt4/QtGui/qdecorationdefault_qws.h +include/qt4/QtGui/qdecorationfactory_qws.h +include/qt4/QtGui/qdecorationplugin_qws.h +include/qt4/QtGui/qdecorationstyled_qws.h +include/qt4/QtGui/qdecorationwindows_qws.h include/qt4/QtGui/qdesktopservices.h include/qt4/QtGui/qdesktopwidget.h include/qt4/QtGui/qdial.h include/qt4/QtGui/qdialog.h include/qt4/QtGui/qdialogbuttonbox.h +include/qt4/QtGui/qdirectpainter_qws.h include/qt4/QtGui/qdirmodel.h include/qt4/QtGui/qdockwidget.h include/qt4/QtGui/qdrag.h @@ -655,6 +858,11 @@ include/qt4/QtGui/qfontinfo.h include/qt4/QtGui/qfontmetrics.h include/qt4/QtGui/qformlayout.h include/qt4/QtGui/qframe.h +include/qt4/QtGui/qgenericmatrix.h +include/qt4/QtGui/qgesture.h +include/qt4/QtGui/qgesturerecognizer.h +include/qt4/QtGui/qgraphicsanchorlayout.h +include/qt4/QtGui/qgraphicseffect.h include/qt4/QtGui/qgraphicsgridlayout.h include/qt4/QtGui/qgraphicsitem.h include/qt4/QtGui/qgraphicsitemanimation.h @@ -664,11 +872,13 @@ include/qt4/QtGui/qgraphicslinearlayout.h include/qt4/QtGui/qgraphicsproxywidget.h include/qt4/QtGui/qgraphicsscene.h include/qt4/QtGui/qgraphicssceneevent.h +include/qt4/QtGui/qgraphicstransform.h include/qt4/QtGui/qgraphicsview.h include/qt4/QtGui/qgraphicswidget.h include/qt4/QtGui/qgridlayout.h include/qt4/QtGui/qgroupbox.h include/qt4/QtGui/qgtkstyle.h +include/qt4/QtGui/qguifunctions_wince.h include/qt4/QtGui/qheaderview.h include/qt4/QtGui/qicon.h include/qt4/QtGui/qiconengine.h @@ -684,6 +894,15 @@ include/qt4/QtGui/qinputdialog.h include/qt4/QtGui/qitemdelegate.h include/qt4/QtGui/qitemeditorfactory.h include/qt4/QtGui/qitemselectionmodel.h +include/qt4/QtGui/qkbd_qws.h +include/qt4/QtGui/qkbddriverfactory_qws.h +include/qt4/QtGui/qkbddriverplugin_qws.h +include/qt4/QtGui/qkbdlinuxinput_qws.h +include/qt4/QtGui/qkbdqnx_qws.h +include/qt4/QtGui/qkbdtty_qws.h +include/qt4/QtGui/qkbdum_qws.h +include/qt4/QtGui/qkbdvfb_qws.h +include/qt4/QtGui/qkeyeventtransition.h include/qt4/QtGui/qkeysequence.h include/qt4/QtGui/qlabel.h include/qt4/QtGui/qlayout.h @@ -692,8 +911,13 @@ include/qt4/QtGui/qlcdnumber.h include/qt4/QtGui/qlineedit.h include/qt4/QtGui/qlistview.h include/qt4/QtGui/qlistwidget.h +include/qt4/QtGui/qmaccocoaviewcontainer_mac.h +include/qt4/QtGui/qmacdefines_mac.h +include/qt4/QtGui/qmacnativewidget_mac.h +include/qt4/QtGui/qmacstyle_mac.h include/qt4/QtGui/qmainwindow.h include/qt4/QtGui/qmatrix.h +include/qt4/QtGui/qmatrix4x4.h include/qt4/QtGui/qmdiarea.h include/qt4/QtGui/qmdisubwindow.h include/qt4/QtGui/qmenu.h @@ -702,6 +926,16 @@ include/qt4/QtGui/qmenudata.h include/qt4/QtGui/qmessagebox.h include/qt4/QtGui/qmime.h include/qt4/QtGui/qmotifstyle.h +include/qt4/QtGui/qmouse_qws.h +include/qt4/QtGui/qmousedriverfactory_qws.h +include/qt4/QtGui/qmousedriverplugin_qws.h +include/qt4/QtGui/qmouseeventtransition.h +include/qt4/QtGui/qmouselinuxinput_qws.h +include/qt4/QtGui/qmouselinuxtp_qws.h +include/qt4/QtGui/qmousepc_qws.h +include/qt4/QtGui/qmouseqnx_qws.h +include/qt4/QtGui/qmousetslib_qws.h +include/qt4/QtGui/qmousevfb_qws.h include/qt4/QtGui/qmovie.h include/qt4/QtGui/qpagesetupdialog.h include/qt4/QtGui/qpaintdevice.h @@ -726,11 +960,25 @@ include/qt4/QtGui/qprintpreviewwidget.h include/qt4/QtGui/qprogressbar.h include/qt4/QtGui/qprogressdialog.h include/qt4/QtGui/qproxymodel.h +include/qt4/QtGui/qproxystyle.h include/qt4/QtGui/qpushbutton.h +include/qt4/QtGui/qquaternion.h include/qt4/QtGui/qradiobutton.h include/qt4/QtGui/qregion.h include/qt4/QtGui/qrgb.h include/qt4/QtGui/qrubberband.h +include/qt4/QtGui/qs60mainapplication.h +include/qt4/QtGui/qs60mainappui.h +include/qt4/QtGui/qs60maindocument.h +include/qt4/QtGui/qs60style.h +include/qt4/QtGui/qscreen_qws.h +include/qt4/QtGui/qscreendriverfactory_qws.h +include/qt4/QtGui/qscreendriverplugin_qws.h +include/qt4/QtGui/qscreenlinuxfb_qws.h +include/qt4/QtGui/qscreenproxy_qws.h +include/qt4/QtGui/qscreenqnx_qws.h +include/qt4/QtGui/qscreentransformed_qws.h +include/qt4/QtGui/qscreenvfb_qws.h include/qt4/QtGui/qscrollarea.h include/qt4/QtGui/qscrollbar.h include/qt4/QtGui/qsessionmanager.h @@ -740,6 +988,7 @@ include/qt4/QtGui/qsizepolicy.h include/qt4/QtGui/qslider.h include/qt4/QtGui/qsortfilterproxymodel.h include/qt4/QtGui/qsound.h +include/qt4/QtGui/qsoundqss_qws.h include/qt4/QtGui/qspinbox.h include/qt4/QtGui/qsplashscreen.h include/qt4/QtGui/qsplitter.h @@ -754,6 +1003,7 @@ include/qt4/QtGui/qstylefactory.h include/qt4/QtGui/qstyleoption.h include/qt4/QtGui/qstylepainter.h include/qt4/QtGui/qstyleplugin.h +include/qt4/QtGui/qsymbianevent.h include/qt4/QtGui/qsyntaxhighlighter.h include/qt4/QtGui/qsystemtrayicon.h include/qt4/QtGui/qtabbar.h @@ -777,6 +1027,8 @@ include/qt4/QtGui/qtoolbox.h include/qt4/QtGui/qtoolbutton.h include/qt4/QtGui/qtooltip.h include/qt4/QtGui/qtransform.h +include/qt4/QtGui/qtransportauth_qws.h +include/qt4/QtGui/qtransportauthdefs_qws.h include/qt4/QtGui/qtreeview.h include/qt4/QtGui/qtreewidget.h include/qt4/QtGui/qtreewidgetitemiterator.h @@ -784,18 +1036,33 @@ include/qt4/QtGui/qundogroup.h include/qt4/QtGui/qundostack.h include/qt4/QtGui/qundoview.h include/qt4/QtGui/qvalidator.h +include/qt4/QtGui/qvector2d.h +include/qt4/QtGui/qvector3d.h +include/qt4/QtGui/qvector4d.h +include/qt4/QtGui/qvfbhdr.h include/qt4/QtGui/qwhatsthis.h include/qt4/QtGui/qwidget.h include/qt4/QtGui/qwidgetaction.h include/qt4/QtGui/qwindowdefs.h +include/qt4/QtGui/qwindowdefs_win.h include/qt4/QtGui/qwindowscestyle.h include/qt4/QtGui/qwindowsmobilestyle.h include/qt4/QtGui/qwindowsstyle.h include/qt4/QtGui/qwindowsvistastyle.h include/qt4/QtGui/qwindowsxpstyle.h +include/qt4/QtGui/qwindowsystem_qws.h include/qt4/QtGui/qwizard.h include/qt4/QtGui/qwmatrix.h include/qt4/QtGui/qworkspace.h +include/qt4/QtGui/qwscursor_qws.h +include/qt4/QtGui/qwsdisplay_qws.h +include/qt4/QtGui/qwsembedwidget.h +include/qt4/QtGui/qwsevent_qws.h +include/qt4/QtGui/qwsmanager_qws.h +include/qt4/QtGui/qwsproperty_qws.h +include/qt4/QtGui/qwsprotocolitem_qws.h +include/qt4/QtGui/qwssocket_qws.h +include/qt4/QtGui/qwsutils_qws.h include/qt4/QtGui/qx11embed_x11.h include/qt4/QtGui/qx11info_x11.h lib/qt4/libQtGui.la @@ -806,6 +1073,7 @@ lib/qt4/libQtGui.so.%%SHLIB_SHVER%% lib/qt4/libQtGui.so.%%SHLIB_VER%% %%DEBUG%%lib/qt4/libQtGui.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtGui.pc +@dirrmtry lib/qt4 @dirrm include/qt4/QtGui @dirrmtry include/qt4/Qt @dirrmtry include/qt4 diff --git a/x11/qt4-inputmethods/Makefile b/x11/qt4-inputmethods/Makefile index 46f5fc3b75bb..6542bfdd9394 100644 --- a/x11/qt4-inputmethods/Makefile +++ b/x11/qt4-inputmethods/Makefile @@ -8,7 +8,6 @@ PORTNAME= inputmethods PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= x11 PKGNAMEPREFIX= qt4- @@ -29,22 +28,26 @@ 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/script src/sql src/svg src/testlib \ - src/tools src/xml src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/multimedia src/network src/opengl \ + src/openvg src/phonon src/qt3support src/s60installs \ + src/s60main src/script src/scripttools src/sql src/svg \ + src/testlib src/tools src/winmain src/xml src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/plugins/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../.. +BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-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 + ${MKDIR} ${WRKSRC}/mkspecs + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake + ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc .include <bsd.port.mk> diff --git a/x11/qt4-inputmethods/pkg-descr b/x11/qt4-inputmethods/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/x11/qt4-inputmethods/pkg-descr +++ b/x11/qt4-inputmethods/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/x11/qt4-inputmethods/pkg-plist b/x11/qt4-inputmethods/pkg-plist index bf964f3acbdb..3af105942e32 100644 --- a/x11/qt4-inputmethods/pkg-plist +++ b/x11/qt4-inputmethods/pkg-plist @@ -1,3 +1,4 @@ -lib/qt4/plugins/inputmethods/libqimsw-multi.so -%%DEBUG%%lib/qt4/plugins/inputmethods/libqimsw-multi.so.debug -@dirrm lib/qt4/plugins/inputmethods +%%QT_PLUGINDIR_REL%%/inputmethods/libqimsw-multi.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/inputmethods/libqimsw-multi.so.debug +@dirrm %%QT_PLUGINDIR_REL%%/inputmethods +@dirrmtry %%QT_PLUGINDIR_REL%% diff --git a/x11/qt4-opengl/Makefile b/x11/qt4-opengl/Makefile index 577538c13646..fe002c362cef 100644 --- a/x11/qt4-opengl/Makefile +++ b/x11/qt4-opengl/Makefile @@ -8,7 +8,6 @@ PORTNAME= opengl PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 CATEGORIES?= x11 PKGNAMEPREFIX= qt4- @@ -19,12 +18,12 @@ USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build corelib gui QT_NONSTANDARD= yes QT_DIST= yes +MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/qt4 USE_GL= glu USE_XORG= x11 -MAKE_JOBS_SAFE= yes ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH @@ -32,31 +31,35 @@ 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/phonon \ - src/qt3support src/script src/sql src/svg src/testlib \ - src/tools src/xml src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit + src/activeqt src/dbus src/multimedia src/network src/openvg \ + src/phonon src/qt3support src/s60installs src/s60main \ + src/script src/scripttools src/sql src/svg src/testlib \ + src/tools src/winmain src/xml src/xmlpatterns \ + src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit EXTRACT_AFTER_ARGS= | ${TAR} -xf - .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME} -CONFIGURE_WRKSRC=${WRKSRC}/../../ +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +CONFIGURE_ARGS+= -I../../include/Qt -I../../include -CONFIGURE_ARGS+= -I../../include/Qt -I../../include +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-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 + ${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 + -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/QtOpenGL.pc + ${WRKSRC}/lib/pkgconfig/QtOpenGL.pc .include <bsd.port.mk> diff --git a/x11/qt4-opengl/pkg-descr b/x11/qt4-opengl/pkg-descr index efc79b9aaf24..36bc69717e98 100644 --- a/x11/qt4-opengl/pkg-descr +++ b/x11/qt4-opengl/pkg-descr @@ -9,4 +9,4 @@ 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 +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/x11/qt4-opengl/pkg-plist b/x11/qt4-opengl/pkg-plist index ca0a00ab3f6d..07a3b0d9bd9e 100644 --- a/x11/qt4-opengl/pkg-plist +++ b/x11/qt4-opengl/pkg-plist @@ -3,12 +3,18 @@ include/qt4/Qt/qgl.h include/qt4/Qt/qglcolormap.h include/qt4/Qt/qglframebufferobject.h include/qt4/Qt/qglpixelbuffer.h -include/qt4/Qt/glgc_shader_source.h +include/qt4/Qt/qglscreen_qws.h +include/qt4/Qt/qglshaderprogram.h include/qt4/QtOpenGL/QGLColormap include/qt4/QtOpenGL/QGLContext include/qt4/QtOpenGL/QGLFormat include/qt4/QtOpenGL/QGLFramebufferObject +include/qt4/QtOpenGL/QGLFramebufferObjectFormat include/qt4/QtOpenGL/QGLPixelBuffer +include/qt4/QtOpenGL/QGLScreen +include/qt4/QtOpenGL/QGLScreenSurfaceFunctions +include/qt4/QtOpenGL/QGLShader +include/qt4/QtOpenGL/QGLShaderProgram include/qt4/QtOpenGL/QGLWidget include/qt4/QtOpenGL/QMacCompatGLenum include/qt4/QtOpenGL/QMacCompatGLint @@ -19,7 +25,8 @@ include/qt4/QtOpenGL/qgl.h include/qt4/QtOpenGL/qglcolormap.h include/qt4/QtOpenGL/qglframebufferobject.h include/qt4/QtOpenGL/qglpixelbuffer.h -include/qt4/QtOpenGL/glgc_shader_source.h +include/qt4/QtOpenGL/qglscreen_qws.h +include/qt4/QtOpenGL/qglshaderprogram.h lib/qt4/libQtOpenGL.la lib/qt4/libQtOpenGL.prl lib/qt4/libQtOpenGL.so @@ -28,6 +35,7 @@ lib/qt4/libQtOpenGL.so.%%SHLIB_SHVER%% lib/qt4/libQtOpenGL.so.%%SHLIB_VER%% %%DEBUG%%lib/qt4/libQtOpenGL.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtOpenGL.pc +@dirrmtry lib/qt4 @dirrm include/qt4/QtOpenGL @dirrmtry include/qt4/Qt @dirrmtry include/qt4 |