aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.kde.mk86
-rw-r--r--Mk/bsd.kde4.mk86
-rw-r--r--Mk/bsd.port.mk10
-rw-r--r--Mk/bsd.qt.mk119
-rw-r--r--accessibility/qt4-accessible/Makefile26
-rw-r--r--accessibility/qt4-accessible/distinfo6
-rw-r--r--chinese/qt4-codecs-cn/Makefile20
-rw-r--r--chinese/qt4-codecs-cn/distinfo6
-rw-r--r--chinese/qt4-codecs-tw/Makefile19
-rw-r--r--chinese/qt4-codecs-tw/distinfo6
-rw-r--r--databases/qt4-ibase-plugin/Makefile15
-rw-r--r--databases/qt4-ibase-plugin/distinfo6
-rw-r--r--databases/qt4-mysql-plugin/Makefile15
-rw-r--r--databases/qt4-mysql-plugin/distinfo6
-rw-r--r--databases/qt4-odbc-plugin/Makefile18
-rw-r--r--databases/qt4-odbc-plugin/distinfo6
-rw-r--r--databases/qt4-pgsql-plugin/Makefile15
-rw-r--r--databases/qt4-pgsql-plugin/distinfo6
-rw-r--r--databases/qt4-sql/Makefile29
-rw-r--r--databases/qt4-sql/distinfo6
-rw-r--r--databases/qt4-sql/pkg-plist4
-rw-r--r--databases/qt4-sqlite-plugin/Makefile15
-rw-r--r--databases/qt4-sqlite-plugin/distinfo6
-rw-r--r--databases/qt4-sqlite3-plugin/Makefile15
-rw-r--r--databases/qt4-sqlite3-plugin/distinfo6
-rw-r--r--devel/Makefile3
-rw-r--r--devel/dbus-qt4/Makefile34
-rw-r--r--devel/dbus-qt4/distinfo6
-rw-r--r--devel/dbus-qt4/pkg-plist10
-rw-r--r--devel/qmake4/Makefile14
-rw-r--r--devel/qmake4/distinfo6
-rw-r--r--devel/qmake4/files/Makefile.bsd8
-rw-r--r--devel/qmake4/pkg-plist21
-rw-r--r--devel/qt4-assistant/Makefile30
-rw-r--r--devel/qt4-assistant/distinfo6
-rw-r--r--devel/qt4-assistant/pkg-plist1
-rw-r--r--devel/qt4-corelib/Makefile43
-rw-r--r--devel/qt4-corelib/distinfo6
-rw-r--r--devel/qt4-corelib/files/patch-qlocale_workaround_patch.txt11
-rw-r--r--devel/qt4-corelib/files/patch-utf8-bug-qt4132
-rw-r--r--devel/qt4-corelib/pkg-plist17
-rw-r--r--devel/qt4-designer/Makefile38
-rw-r--r--devel/qt4-designer/distinfo6
-rw-r--r--devel/qt4-designer/pkg-plist21
-rw-r--r--devel/qt4-libqtassistantclient/Makefile33
-rw-r--r--devel/qt4-libqtassistantclient/distinfo6
-rw-r--r--devel/qt4-libqtassistantclient/pkg-plist6
-rw-r--r--devel/qt4-linguist/Makefile28
-rw-r--r--devel/qt4-linguist/distinfo6
-rw-r--r--devel/qt4-linguist/pkg-plist1
-rw-r--r--devel/qt4-makeqpf/Makefile55
-rw-r--r--devel/qt4-makeqpf/distinfo3
-rw-r--r--devel/qt4-makeqpf/files/patch-tools-makeqpf-qpf2.cpp11
-rw-r--r--devel/qt4-makeqpf/pkg-descr12
-rw-r--r--devel/qt4-makeqpf/pkg-plist2
-rw-r--r--devel/qt4-moc/Makefile20
-rw-r--r--devel/qt4-moc/distinfo6
-rw-r--r--devel/qt4-porting/Makefile25
-rw-r--r--devel/qt4-porting/distinfo6
-rw-r--r--devel/qt4-qdbusviewer/Makefile57
-rw-r--r--devel/qt4-qdbusviewer/distinfo3
-rw-r--r--devel/qt4-qdbusviewer/pkg-descr12
-rw-r--r--devel/qt4-qdbusviewer/pkg-plist2
-rw-r--r--devel/qt4-qt3support/Makefile30
-rw-r--r--devel/qt4-qt3support/distinfo6
-rw-r--r--devel/qt4-qt3support/pkg-plist6
-rw-r--r--devel/qt4-qtestlib/Makefile35
-rw-r--r--devel/qt4-qtestlib/distinfo6
-rw-r--r--devel/qt4-qtestlib/pkg-plist7
-rw-r--r--devel/qt4-qvfb/Makefile28
-rw-r--r--devel/qt4-qvfb/distinfo6
-rw-r--r--devel/qt4-qvfb/files/patch-qvfbshmem.cpp11
-rw-r--r--devel/qt4-qvfb/files/patch-qwssignalhandler.cpp16
-rw-r--r--devel/qt4-qvfb/pkg-plist118
-rw-r--r--devel/qt4-rcc/Makefile18
-rw-r--r--devel/qt4-rcc/distinfo6
-rw-r--r--devel/qt4-script/Makefile68
-rw-r--r--devel/qt4-script/distinfo3
-rw-r--r--devel/qt4-script/pkg-descr12
-rw-r--r--devel/qt4-script/pkg-plist32
-rw-r--r--devel/qt4-uic/Makefile20
-rw-r--r--devel/qt4-uic/distinfo6
-rw-r--r--devel/qt4-uic3/Makefile26
-rw-r--r--devel/qt4-uic3/distinfo6
-rw-r--r--devel/qt4/Makefile8
-rw-r--r--devel/qt4/files/configure791
-rw-r--r--graphics/poppler/Makefile1
-rw-r--r--graphics/qt4-iconengines/Makefile25
-rw-r--r--graphics/qt4-iconengines/distinfo6
-rw-r--r--graphics/qt4-imageformats/Makefile30
-rw-r--r--graphics/qt4-imageformats/distinfo6
-rw-r--r--graphics/qt4-imageformats/pkg-plist2
-rw-r--r--graphics/qt4-pixeltool/Makefile27
-rw-r--r--graphics/qt4-pixeltool/distinfo6
-rw-r--r--graphics/qt4-svg/Makefile30
-rw-r--r--graphics/qt4-svg/distinfo6
-rw-r--r--graphics/qt4-svg/pkg-plist10
-rw-r--r--japanese/qt4-codecs-jp/Makefile20
-rw-r--r--japanese/qt4-codecs-jp/distinfo6
-rw-r--r--korean/qt4-codecs-kr/Makefile20
-rw-r--r--korean/qt4-codecs-kr/distinfo6
-rw-r--r--misc/qt4-doc/Makefile16
-rw-r--r--misc/qt4-doc/distinfo6
-rw-r--r--misc/qt4-doc/pkg-plist411
-rw-r--r--misc/qt4-qtconfig/Makefile25
-rw-r--r--misc/qt4-qtconfig/distinfo6
-rw-r--r--misc/qt4-qtdemo/Makefile36
-rw-r--r--misc/qt4-qtdemo/distinfo6
-rw-r--r--misc/qt4-qtdemo/pkg-plist358
-rw-r--r--multimedia/vlc-devel/Makefile1
-rw-r--r--net/qt4-network/Makefile30
-rw-r--r--net/qt4-network/distinfo6
-rw-r--r--net/qt4-network/pkg-plist26
-rw-r--r--textproc/qt4-xml/Makefile28
-rw-r--r--textproc/qt4-xml/distinfo6
-rw-r--r--textproc/qt4-xml/pkg-plist18
-rw-r--r--x11-toolkits/qt4-gui/Makefile35
-rw-r--r--x11-toolkits/qt4-gui/distinfo6
-rw-r--r--x11-toolkits/qt4-gui/pkg-plist41
-rw-r--r--x11/qt4-inputmethods/Makefile23
-rw-r--r--x11/qt4-inputmethods/distinfo6
-rw-r--r--x11/qt4-opengl/Makefile29
-rw-r--r--x11/qt4-opengl/distinfo6
-rw-r--r--x11/qt4-opengl/pkg-plist6
124 files changed, 2380 insertions, 1476 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk
index db0640bc0f53..559021f950c3 100644
--- a/Mk/bsd.kde.mk
+++ b/Mk/bsd.kde.mk
@@ -12,11 +12,9 @@ KDE_MAINTAINER= kde@FreeBSD.org
# This section contains the USE_ definitions.
# XXX: Write HAVE_ definitions sometime.
-# QT_COMPONENTS - Triggers individual Qt4 component port dependencies. Possible
-# values: See _QT_COMPONENTS_ALL below. Only works if USE_QT_VER is set
-# to 4.
# USE_QT_VER - Says that the port uses the Qt toolkit. Possible values:
# 3, 4; each specify the major version of Qt to use.
+# Note: 4 is handled by bsd.qt.mk.
# USE_KDELIBS_VER - Says that the port uses KDE libraries. Possible values:
# 3 specifies the major version of KDE to use.
# This implies USE_QT of the appropriate version.
@@ -136,88 +134,6 @@ CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGL
QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
.endif # !defined(QT_NONSTANDARD)
-.elif ${USE_QT_VER} == 4
-
-# Qt 4.x common stuff
-QT_PREFIX?= ${LOCALBASE}
-MOC?= ${QT_PREFIX}/bin/moc-qt4
-UIC?= ${QT_PREFIX}/bin/uic-qt4
-QMAKE?= ${QT_PREFIX}/bin/qmake-qt4
-QMAKESPEC?= ${QT_PREFIX}/share/qt4/mkspecs/freebsd-g++
-
-QTCPPFLAGS?=
-QTCGFLIBS?=
-
-.if !defined(QT_NONSTANDARD)
-CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \
- --with-qt-libraries=${QT_PREFIX}/lib \
- --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}" KDEDIR="${KDE_PREFIX}"
-MAKE_ENV+= QMAKESPEC="${QMAKESPEC}"
-.endif # !defined(QT_NONSTANDARD)
-
-QT4_VERSION= 4.2.3
-
-_QT_COMPONENTS_ALL= accessible assistant codecs-cn codecs-jp codecs-kr \
- codecs-tw corelib designer doc gui iconengines \
- imageformats inputmethods assistantclient \
- linguist moc network opengl pixeltool porting \
- qmake qt3support qtconfig qtestlib qvfb rcc sql svg \
- uic uic3 xml
-
-accessible_DEPENDS= accessibility/qt4-acessible
-assistant_DEPENDS= devel/qt4-assistant
-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
-designer_DEPENDS= devel/qt4-designer
-doc_DEPENDS= misc/qt4-doc
-gui_DEPENDS= x11-toolkits/qt4-gui
-iconengines_DEPENDS= graphics/qt4-iconengines
-imageformats_DEPENDS= graphics/qt4-imageformats
-inputmethods_DEPENDS= x11/qt4-inputmethods
-assistantclient_DEPENDS=devel/qt4-libqtassistantclient
-assistantclient_NAME= libQtAssistantClient
-linguist_DEPENDS= devel/qt4-linguist
-moc_DEPENDS= devel/qt4-moc
-network_DEPENDS= net/qt4-network
-opengl_DEPENDS= x11/qt4-opengl
-pixeltool_DEPENDS= graphics/qt4-pixeltool
-porting_DEPENDS= devel/qt4-porting
-qmake_DEPENDS= devel/qmake4
-qmake_QT4_PREFIX= # empty
-qt3support_DEPENDS= devel/qt4-qt3support
-qtconfig_DEPENDS= devel/qtconfig
-qtestlib_DEPENDS= devel/qt4-qtestlib
-qvfb_DEPENDS= devel/qt4-qvfb
-rcc_DEPENDS= devel/qt4-rcc
-sql_DEPENDS= databases/qt4-sql
-svg_DEPENDS= graphics/qt4-svg
-uic_DEPENDS= devel/qt4-uic
-uic3_DEPENDS= devel/qt4-uic3
-xml_DEPENDS= textproc/qt4-xml
-
-.if defined(QT_COMPONENTS)
-.for ext in ${QT_COMPONENTS}
-${ext}_QT4_PREFIX?= qt4-
-${ext}_QT4_VERSION?= ${QT4_VERSION}
-${ext}_NAME?= ${ext}
-.if ${_QT_COMPONENTS_ALL:M${ext}}!= ""
-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}
-.else
-IGNORE= cannot install: unknown Qt4 component -- ${ext}
-.endif
-.endfor
-.else
-BUILD_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
-RUN_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
-.endif
-
.else
IGNORE= cannot install: unsupported value of USE_QT_VER
.endif # defined(USE_QT_VER)
diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index db0640bc0f53..559021f950c3 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -12,11 +12,9 @@ KDE_MAINTAINER= kde@FreeBSD.org
# This section contains the USE_ definitions.
# XXX: Write HAVE_ definitions sometime.
-# QT_COMPONENTS - Triggers individual Qt4 component port dependencies. Possible
-# values: See _QT_COMPONENTS_ALL below. Only works if USE_QT_VER is set
-# to 4.
# USE_QT_VER - Says that the port uses the Qt toolkit. Possible values:
# 3, 4; each specify the major version of Qt to use.
+# Note: 4 is handled by bsd.qt.mk.
# USE_KDELIBS_VER - Says that the port uses KDE libraries. Possible values:
# 3 specifies the major version of KDE to use.
# This implies USE_QT of the appropriate version.
@@ -136,88 +134,6 @@ CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGL
QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
.endif # !defined(QT_NONSTANDARD)
-.elif ${USE_QT_VER} == 4
-
-# Qt 4.x common stuff
-QT_PREFIX?= ${LOCALBASE}
-MOC?= ${QT_PREFIX}/bin/moc-qt4
-UIC?= ${QT_PREFIX}/bin/uic-qt4
-QMAKE?= ${QT_PREFIX}/bin/qmake-qt4
-QMAKESPEC?= ${QT_PREFIX}/share/qt4/mkspecs/freebsd-g++
-
-QTCPPFLAGS?=
-QTCGFLIBS?=
-
-.if !defined(QT_NONSTANDARD)
-CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \
- --with-qt-libraries=${QT_PREFIX}/lib \
- --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}" KDEDIR="${KDE_PREFIX}"
-MAKE_ENV+= QMAKESPEC="${QMAKESPEC}"
-.endif # !defined(QT_NONSTANDARD)
-
-QT4_VERSION= 4.2.3
-
-_QT_COMPONENTS_ALL= accessible assistant codecs-cn codecs-jp codecs-kr \
- codecs-tw corelib designer doc gui iconengines \
- imageformats inputmethods assistantclient \
- linguist moc network opengl pixeltool porting \
- qmake qt3support qtconfig qtestlib qvfb rcc sql svg \
- uic uic3 xml
-
-accessible_DEPENDS= accessibility/qt4-acessible
-assistant_DEPENDS= devel/qt4-assistant
-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
-designer_DEPENDS= devel/qt4-designer
-doc_DEPENDS= misc/qt4-doc
-gui_DEPENDS= x11-toolkits/qt4-gui
-iconengines_DEPENDS= graphics/qt4-iconengines
-imageformats_DEPENDS= graphics/qt4-imageformats
-inputmethods_DEPENDS= x11/qt4-inputmethods
-assistantclient_DEPENDS=devel/qt4-libqtassistantclient
-assistantclient_NAME= libQtAssistantClient
-linguist_DEPENDS= devel/qt4-linguist
-moc_DEPENDS= devel/qt4-moc
-network_DEPENDS= net/qt4-network
-opengl_DEPENDS= x11/qt4-opengl
-pixeltool_DEPENDS= graphics/qt4-pixeltool
-porting_DEPENDS= devel/qt4-porting
-qmake_DEPENDS= devel/qmake4
-qmake_QT4_PREFIX= # empty
-qt3support_DEPENDS= devel/qt4-qt3support
-qtconfig_DEPENDS= devel/qtconfig
-qtestlib_DEPENDS= devel/qt4-qtestlib
-qvfb_DEPENDS= devel/qt4-qvfb
-rcc_DEPENDS= devel/qt4-rcc
-sql_DEPENDS= databases/qt4-sql
-svg_DEPENDS= graphics/qt4-svg
-uic_DEPENDS= devel/qt4-uic
-uic3_DEPENDS= devel/qt4-uic3
-xml_DEPENDS= textproc/qt4-xml
-
-.if defined(QT_COMPONENTS)
-.for ext in ${QT_COMPONENTS}
-${ext}_QT4_PREFIX?= qt4-
-${ext}_QT4_VERSION?= ${QT4_VERSION}
-${ext}_NAME?= ${ext}
-.if ${_QT_COMPONENTS_ALL:M${ext}}!= ""
-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}
-.else
-IGNORE= cannot install: unknown Qt4 component -- ${ext}
-.endif
-.endfor
-.else
-BUILD_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
-RUN_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
-.endif
-
.else
IGNORE= cannot install: unsupported value of USE_QT_VER
.endif # defined(USE_QT_VER)
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index cef3fccae2ed..647c161e8805 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1587,10 +1587,14 @@ PERL= ${LOCALBASE}/bin/perl
.include "${PORTSDIR}/Mk/bsd.apache.mk"
.endif
-.if defined(USE_QT_VER) || defined(USE_KDELIBS_VER) || defined(USE_KDEBASE_VER)
+.if (defined(USE_QT_VER) && ${USE_QT_VER:L} == 3) || defined(USE_KDELIBS_VER) || defined(USE_KDEBASE_VER)
.include "${PORTSDIR}/Mk/bsd.kde.mk"
.endif
+.if defined (USE_QT_VER) && ${USE_QT_VER:L} == 4
+.include "${PORTSDIR}/Mk/bsd.qt.mk"
+.endif
+
.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK)
.include "${PORTSDIR}/Mk/bsd.gnome.mk"
.endif
@@ -2100,6 +2104,10 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk"
.endif
+.if defined (USE_QT_VER) && ${USE_QT_VER:L} == 4
+.include "${PORTSDIR}/Mk/bsd.qt.mk"
+.endif
+
.if defined(USE_SCONS)
.include "${PORTSDIR}/Mk/bsd.scons.mk"
.endif
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk
new file mode 100644
index 000000000000..58a24f10708c
--- /dev/null
+++ b/Mk/bsd.qt.mk
@@ -0,0 +1,119 @@
+.if !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include)
+Qt_Include_MAINTAINER= kde@freebsd.org
+Qt_Pre_Include= bsd.qt.mk
+
+.if !defined(QT_NONSTANDARD)
+CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \
+ --with-qt-libraries=${QT_PREFIX}/lib \
+ --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}"
+.endif # !defined(QT_NONSTANDARD)
+
+.if defined(QT_DIST)
+#CONFLICTS+= Currently there are no conflicts \o/
+CONFIGURE_ARGS+=-fast -no-exceptions ${CUPS} \
+ -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
+ -qt-gif -release -system-libjpeg -system-libpng \
+ -system-libmng -system-libtiff -system-zlib \
+ -confirm-license \
+ -prefix ${PREFIX} \
+ -docdir ${PREFIX}/share/doc/qt4 \
+ -headerdir ${PREFIX}/include \
+ -plugindir ${PREFIX}/lib/plugins \
+ -datadir ${PREFIX}/share/qt4 \
+ -libdir ${PREFIX}/lib \
+ -translationdir ${PREFIX}/share/qt4/translations \
+ -sysconfdir ${PREFIX}/local/etc/xdg \
+ -examplesdir ${PREFIX}/share/qt4/examples \
+ -demosdir ${PREFIX}/share/qt4/demos \
+ -bindir ${PREFIX}/bin
+.if defined(PACKAGE_BUILDING)
+CONFIGURE_ARGS+=-no-3dnow -no-sse -no-sse2
+.endif #defined(PACKAGE_BUILDING)
+
+.if defined(QT_WANT_VERBOSE_CONFIGURE)
+CONFIGURE_ARGS+=-v
+.endif
+.endif #defined(QT_DIST)
+
+QT_PREFIX?= ${LOCALBASE}
+MOC?= ${QT_PREFIX}/bin/moc-qt4
+UIC?= ${QT_PREFIX}/bin/uic-qt4
+QMAKE?= ${QT_PREFIX}/bin/qmake-qt4
+QMAKESPEC?= ${QT_PREFIX}/share/qt4/mkspecs/freebsd-g++
+
+QTCPPFLAGS?=
+QTCGFLIBS?=
+.endif # !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include)
+
+QT4_VERSION?= 4.3.0
+
+_QT_COMPONENTS_ALL= accessible assistant assistantclient codecs-cn \
+ codecs-jp codecs-kr codecs-tw corelib dbus designer \
+ doc gui iconengines imageformats inputmethods linguist \
+ makeqpf moc network opengl pixeltool porting qdbusviewer \
+ qmake qt3support qtconfig qtestlib qvfb rcc script sql \
+ svg uic uic3 xml
+
+accessible_DEPENDS= accessibility/qt4-acessible
+assistant_DEPENDS= devel/qt4-assistant
+assistantclient_DEPENDS=devel/qt4-libqtassistantclient
+assistantclient_NAME= libQtAssistantClient
+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
+iconengines_DEPENDS= graphics/qt4-iconengines
+imageformats_DEPENDS= graphics/qt4-imageformats
+inputmethods_DEPENDS= x11/qt4-inputmethods
+linguist_DEPENDS= devel/qt4-linguist
+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
+porting_DEPENDS= devel/qt4-porting
+qdbusviewer_DEPENDS= devel/qt4-qdbusviewer
+qmake_DEPENDS= devel/qmake4
+qmake_QT4_PREFIX= # empty
+qt3support_DEPENDS= devel/qt4-qt3support
+qtconfig_DEPENDS= devel/qtconfig
+qtestlib_DEPENDS= devel/qt4-qtestlib
+qvfb_DEPENDS= devel/qt4-qvfb
+rcc_DEPENDS= devel/qt4-rcc
+script_DEPENDS= devel/qt4-script
+sql_DEPENDS= databases/qt4-sql
+svg_DEPENDS= graphics/qt4-svg
+uic_DEPENDS= devel/qt4-uic
+uic3_DEPENDS= devel/qt4-uic3
+xml_DEPENDS= textproc/qt4-xml
+
+.if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include)
+Qt_Post_Include= bsd.qt.mk
+
+.if defined(QT_COMPONENTS)
+.for ext in ${QT_COMPONENTS}
+${ext}_QT4_PREFIX?= qt4-
+${ext}_QT4_VERSION?= ${QT4_VERSION}
+${ext}_NAME?= ${ext}
+.if ${_QT_COMPONENTS_ALL:M${ext}}!= ""
+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}
+.else
+IGNORE= cannot install: unknown Qt4 component -- ${ext}
+.endif
+.endfor
+.else
+BUILD_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
+RUN_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
+.endif
+
+.endif
diff --git a/accessibility/qt4-accessible/Makefile b/accessibility/qt4-accessible/Makefile
index c3f91df00cca..33fe86a435f4 100644
--- a/accessibility/qt4-accessible/Makefile
+++ b/accessibility/qt4-accessible/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= accessible
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= accessibility
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,27 +18,13 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt accessibility widgets
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4
-LIB_DEPENDS= Qt3Support:${PORTSDIR}/devel/qt4-qt3support \
- QtCore:${PORTSDIR}/devel/qt4-corelib \
- QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
- QtNetwork:${PORTSDIR}/net/qt4-network \
- QtSql:${PORTSDIR}/databases/qt4-sql \
- QtXml:${PORTSDIR}/textproc/qt4-xml
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc qt3support corelib gui network sql xml
+QT_NONSTANDARD= yes
+QT_DIST= yes
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
-
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -prefix ${PREFIX} -plugindir ${PREFIX}/lib/plugins \
- -bindir ${PREFIX}/bin -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/accessibility/qt4-accessible/distinfo b/accessibility/qt4-accessible/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/accessibility/qt4-accessible/distinfo
+++ b/accessibility/qt4-accessible/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/chinese/qt4-codecs-cn/Makefile b/chinese/qt4-codecs-cn/Makefile
index 141f37341427..ed065ad49db9 100644
--- a/chinese/qt4-codecs-cn/Makefile
+++ b/chinese/qt4-codecs-cn/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= codecs
-PORTVERSION= 4.2.3
+PORTVERSION= ${QT4_VERSION}
CATEGORIES?= chinese
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,22 +18,12 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt GB 18030 codec plugin
-BUILD_DEPENDS= qmake-qt4:${PORTSDIR}/devel/qmake4
-LIB_DEPENDS= QtCore:${PORTSDIR}/devel/qt4-corelib
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake corelib
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
-USE_LDCONFIG= yes
-
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
diff --git a/chinese/qt4-codecs-cn/distinfo b/chinese/qt4-codecs-cn/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/chinese/qt4-codecs-cn/distinfo
+++ b/chinese/qt4-codecs-cn/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/chinese/qt4-codecs-tw/Makefile b/chinese/qt4-codecs-tw/Makefile
index eb0839f53005..270444b5e42e 100644
--- a/chinese/qt4-codecs-tw/Makefile
+++ b/chinese/qt4-codecs-tw/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= codecs
-PORTVERSION= 4.2.3
+PORTVERSION= ${QT4_VERSION}
CATEGORIES?= chinese
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,22 +18,13 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt Big-5 codec plugin
-BUILD_DEPENDS= qmake-qt4:${PORTSDIR}/devel/qmake4
-LIB_DEPENDS= QtCore:${PORTSDIR}/devel/qt4-corelib
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake corelib
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/chinese/qt4-codecs-tw/distinfo b/chinese/qt4-codecs-tw/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/chinese/qt4-codecs-tw/distinfo
+++ b/chinese/qt4-codecs-tw/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/databases/qt4-ibase-plugin/Makefile b/databases/qt4-ibase-plugin/Makefile
index c810af3c37d8..6dd37e545a55 100644
--- a/databases/qt4-ibase-plugin/Makefile
+++ b/databases/qt4-ibase-plugin/Makefile
@@ -7,21 +7,22 @@
#
PORTNAME= qt4-${DB}-plugin
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= ${QT4_VERSION}
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_QT}
DISTNAME= qt-x11-opensource-src-${PORTVERSION}
DIST_SUBDIR= KDE
-MAINTAINER= kde@freebsd.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Qt IBase/Firebird database plugin
DB= ibase
-BUILD_DEPENDS+= moc-qt4:${PORTSDIR}/devel/qt4-moc
-LIB_DEPENDS+= gds:${PORTSDIR}/databases/firebird-client \
- QtSql:${PORTSDIR}/databases/qt4-sql
+LIB_DEPENDS+= gds:${PORTSDIR}/databases/firebird-client
+
+USE_QT_VER= 4
+QT_COMPONENTS= moc sql
+QT_NONSTANDARD= yes
#USE_BZIP2= yes
DRIVER= src/sql/drivers/${DB}
@@ -31,7 +32,7 @@ EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \
${DISTNAME}/include/QtSql \
${DISTNAME}/src/sql/kernel
MAKEFILE= ${FILESDIR}/Makefile.bsd
-MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" \
+MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
PLUGIN="${PLUGIN}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/databases/qt4-ibase-plugin/distinfo b/databases/qt4-ibase-plugin/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/databases/qt4-ibase-plugin/distinfo
+++ b/databases/qt4-ibase-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/databases/qt4-mysql-plugin/Makefile b/databases/qt4-mysql-plugin/Makefile
index 35333cbc0964..bf47e4f102ba 100644
--- a/databases/qt4-mysql-plugin/Makefile
+++ b/databases/qt4-mysql-plugin/Makefile
@@ -7,29 +7,30 @@
#
PORTNAME= qt4-${DB}-plugin
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= ${QT4_VERSION}
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_QT}
DISTNAME= qt-x11-opensource-src-${PORTVERSION}
DIST_SUBDIR= KDE
-MAINTAINER= kde@freebsd.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Qt MySQL database plugin
DB= mysql
-BUILD_DEPENDS+= moc-qt4:${PORTSDIR}/devel/qt4-moc
-LIB_DEPENDS+= QtSql:${PORTSDIR}/databases/qt4-sql
+USE_QT_VER= 4
+QT_COMPONENTS= moc sql
+QT_NONSTANDARD= yes
USE_MYSQL= yes
#USE_BZIP2= yes
DRIVER= src/sql/drivers/${DB}
PLUGIN= src/plugins/sqldrivers/${DB}
EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \
- ${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN}
+ ${DISTNAME}/${DRIVER} \
+ ${DISTNAME}/${PLUGIN}
MAKEFILE= ${FILESDIR}/Makefile.bsd
-MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" \
+MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
PLUGIN="${PLUGIN}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/databases/qt4-mysql-plugin/distinfo b/databases/qt4-mysql-plugin/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/databases/qt4-mysql-plugin/distinfo
+++ b/databases/qt4-mysql-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/databases/qt4-odbc-plugin/Makefile b/databases/qt4-odbc-plugin/Makefile
index 29ba5dfab69f..477a9ced62d7 100644
--- a/databases/qt4-odbc-plugin/Makefile
+++ b/databases/qt4-odbc-plugin/Makefile
@@ -7,29 +7,31 @@
#
PORTNAME= qt4-${DB}-plugin
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= ${QT4_VERSION}
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_QT}
DISTNAME= qt-x11-opensource-src-${PORTVERSION}
DIST_SUBDIR= KDE
-MAINTAINER= kde@freebsd.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Qt ODBC database plugin
DB= odbc
-BUILD_DEPENDS+= moc-qt4:${PORTSDIR}/devel/qt4-moc
-LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC \
- QtSql:${PORTSDIR}/databases/qt4-sql
+LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC
+
+USE_QT_VER= 4
+QT_COMPONENTS= moc sql
+QT_NONSTANDARD= yes
#USE_BZIP2= yes
DRIVER= src/sql/drivers/${DB}
PLUGIN= src/plugins/sqldrivers/${DB}
EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \
- ${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN}
+ ${DISTNAME}/${DRIVER} \
+ ${DISTNAME}/${PLUGIN}
MAKEFILE= ${FILESDIR}/Makefile.bsd
-MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" \
+MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
PLUGIN="${PLUGIN}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/databases/qt4-odbc-plugin/distinfo b/databases/qt4-odbc-plugin/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/databases/qt4-odbc-plugin/distinfo
+++ b/databases/qt4-odbc-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/databases/qt4-pgsql-plugin/Makefile b/databases/qt4-pgsql-plugin/Makefile
index 735bfd0b46cb..da73df1ec065 100644
--- a/databases/qt4-pgsql-plugin/Makefile
+++ b/databases/qt4-pgsql-plugin/Makefile
@@ -7,29 +7,30 @@
#
PORTNAME= qt4-${DB}-plugin
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= ${QT4_VERSION}
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_QT}
DISTNAME= qt-x11-opensource-src-${PORTVERSION}
DIST_SUBDIR= KDE
-MAINTAINER= kde@freebsd.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Qt PostgreSQL database plugin
DB= psql
-BUILD_DEPENDS+= moc-qt4:${PORTSDIR}/devel/qt4-moc
-LIB_DEPENDS+= QtSql:${PORTSDIR}/databases/qt4-sql
+USE_QT_VER= 4
+QT_COMPONENTS= moc sql
+QT_NONSTANDARD= yes
USE_PGSQL= yes
#USE_BZIP2= yes
DRIVER= src/sql/drivers/${DB}
PLUGIN= src/plugins/sqldrivers/${DB}
EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \
- ${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN}
+ ${DISTNAME}/${DRIVER} \
+ ${DISTNAME}/${PLUGIN}
MAKEFILE= ${FILESDIR}/Makefile.bsd
-MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" \
+MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
PLUGIN="${PLUGIN}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/databases/qt4-pgsql-plugin/distinfo b/databases/qt4-pgsql-plugin/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/databases/qt4-pgsql-plugin/distinfo
+++ b/databases/qt4-pgsql-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile
index 156d4d5e4ecb..e410c73b442a 100644
--- a/databases/qt4-sql/Makefile
+++ b/databases/qt4-sql/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= sql
-PORTVERSION= 4.2.3
-PORTREVISION= 2
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,24 +18,14 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SQL library
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4
-LIB_DEPENDS?= QtCore:${PORTSDIR}/devel/qt4-corelib
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc corelib
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
@@ -74,12 +64,11 @@ pre-configure:
${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/QtSql.pc|${PREFIX}/libdata/pkgconfig/QtSql.pc|g' \
- -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' \
- ${WRKSRC}/Makefile
+ ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+ -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${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/*Qt*
+ ${WRKSRC}/../../lib/pkgconfig/*Qt*
.include <bsd.port.post.mk>
diff --git a/databases/qt4-sql/distinfo b/databases/qt4-sql/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/databases/qt4-sql/distinfo
+++ b/databases/qt4-sql/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/databases/qt4-sql/pkg-plist b/databases/qt4-sql/pkg-plist
index b0196dc41d5b..14c2bdc1da3c 100644
--- a/databases/qt4-sql/pkg-plist
+++ b/databases/qt4-sql/pkg-plist
@@ -73,7 +73,7 @@ lib/libQtSql.la
lib/libQtSql.prl
lib/libQtSql.so
lib/libQtSql.so.4
-lib/libQtSql.so.4.2
-lib/libQtSql.so.4.2.3
+lib/libQtSql.so.4.3
+lib/libQtSql.so.4.3.0
libdata/pkgconfig/QtSql.pc
@dirrm include/QtSql
diff --git a/databases/qt4-sqlite-plugin/Makefile b/databases/qt4-sqlite-plugin/Makefile
index 9476ab4a3767..30f74fbb76ba 100644
--- a/databases/qt4-sqlite-plugin/Makefile
+++ b/databases/qt4-sqlite-plugin/Makefile
@@ -7,21 +7,22 @@
#
PORTNAME= qt4-${DB}-plugin
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= ${QT4_VERSION}
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_QT}
DISTNAME= qt-x11-opensource-src-${PORTVERSION}
DIST_SUBDIR= KDE
-MAINTAINER= kde@freebsd.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SQLite 2.x database plugin
DB= sqlite2
-BUILD_DEPENDS+= moc-qt4:${PORTSDIR}/devel/qt4-moc
-LIB_DEPENDS+= QtSql:${PORTSDIR}/databases/qt4-sql \
- sqlite.2:${PORTSDIR}/databases/sqlite2
+LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2
+
+USE_QT_VER= 4
+QT_COMPONENTS= moc sql
+QT_NONSTANDARD= yes
#USE_BZIP2= yes
DRIVER= src/sql/drivers/${DB}
@@ -31,7 +32,7 @@ EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \
${DISTNAME}/include/QtSql \
${DISTNAME}/src/sql/kernel
MAKEFILE= ${FILESDIR}/Makefile.bsd
-MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" \
+MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
PLUGIN="${PLUGIN}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/databases/qt4-sqlite-plugin/distinfo b/databases/qt4-sqlite-plugin/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/databases/qt4-sqlite-plugin/distinfo
+++ b/databases/qt4-sqlite-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/databases/qt4-sqlite3-plugin/Makefile b/databases/qt4-sqlite3-plugin/Makefile
index 90d5452d68f5..7ead82825396 100644
--- a/databases/qt4-sqlite3-plugin/Makefile
+++ b/databases/qt4-sqlite3-plugin/Makefile
@@ -7,21 +7,22 @@
#
PORTNAME= qt4-${DB}-plugin
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= ${QT4_VERSION}
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_QT}
DISTNAME= qt-x11-opensource-src-${PORTVERSION}
DIST_SUBDIR= KDE
-MAINTAINER= kde@freebsd.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SQLite 3.x database plugin
DB= sqlite
-BUILD_DEPENDS+= moc-qt4:${PORTSDIR}/devel/qt4-moc
-LIB_DEPENDS+= QtSql:${PORTSDIR}/databases/qt4-sql \
- sqlite3:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3
+
+USE_QT_VER= 4
+QT_COMPONENTS= moc sql
+QT_NONSTANDARD= yes
#USE_BZIP2= yes
DRIVER= src/sql/drivers/${DB}
@@ -31,7 +32,7 @@ EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \
${DISTNAME}/include/QtSql \
${DISTNAME}/src/sql/kernel
MAKEFILE= ${FILESDIR}/Makefile.bsd
-MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" \
+MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
PLUGIN="${PLUGIN}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/databases/qt4-sqlite3-plugin/distinfo b/databases/qt4-sqlite3-plugin/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/databases/qt4-sqlite3-plugin/distinfo
+++ b/databases/qt4-sqlite3-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/devel/Makefile b/devel/Makefile
index f4414270af20..075023cea3b2 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1971,12 +1971,15 @@
SUBDIR += qt4-designer
SUBDIR += qt4-libqtassistantclient
SUBDIR += qt4-linguist
+ SUBDIR += qt4-makeqpf
SUBDIR += qt4-moc
SUBDIR += qt4-porting
+ SUBDIR += qt4-qdbusviewer
SUBDIR += qt4-qt3support
SUBDIR += qt4-qtestlib
SUBDIR += qt4-qvfb
SUBDIR += qt4-rcc
+ SUBDIR += qt4-script
SUBDIR += qt4-uic
SUBDIR += qt4-uic3
SUBDIR += qsa
diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile
index cc6bfa612e10..52768b9b135e 100644
--- a/devel/dbus-qt4/Makefile
+++ b/devel/dbus-qt4/Makefile
@@ -7,37 +7,27 @@
#
PORTNAME= dbus
-PORTVERSION= 4.2.3
-PORTREVISION= 3
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_QT}
-PKGNAMESUFFIX= -qt4
+PKGNAMEPREFIX= qt4-
DISTNAME= qt-x11-opensource-src-${PORTVERSION}
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt4 bindings for the D-BUS messaging system
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4
-LIB_DEPENDS= QtCore:${PORTSDIR}/devel/qt4-corelib \
- QtXml:${PORTSDIR}/textproc/qt4-xml \
- dbus-1.3:${PORTSDIR}/devel/dbus
+LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc rcc corelib gui xml
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -system-nas-sound -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin -v \
- -no-nas-sound -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
@@ -56,7 +46,8 @@ CONFIGURE_WRKSRC=${WRKSRC}/../../
.include <bsd.port.pre.mk>
pre-configure:
- ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
+ ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
+ ${REINPLACE_CMD} -e 's|qdbusviewer||g' ${WRKSRC}/tools/tools.pro
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \
${WRKSRC}/tools/qdbus/qdbus.pro \
${WRKSRC}/tools/qdbuscpp2xml/qdbuscpp2xml.pro \
@@ -67,13 +58,14 @@ 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/rcc ${WRKSRC}/../../bin/rcc
post-configure:
- ${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtDBus.pc|${PREFIX}/libdata/pkgconfig/QtDBus.pc|g' \
+ ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-e 's|.*$$(QMAKE).*||g' ${WRKSRC}/src/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/*Qt*
+ ${WRKSRC}/../../lib/pkgconfig/*Qt*
.include <bsd.port.post.mk>
diff --git a/devel/dbus-qt4/distinfo b/devel/dbus-qt4/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/devel/dbus-qt4/distinfo
+++ b/devel/dbus-qt4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/devel/dbus-qt4/pkg-plist b/devel/dbus-qt4/pkg-plist
index d1b337562ef0..9575b6c51744 100644
--- a/devel/dbus-qt4/pkg-plist
+++ b/devel/dbus-qt4/pkg-plist
@@ -9,6 +9,7 @@ include/QtDBus/QDBusAbstractInterface
include/QtDBus/QDBusArgument
include/QtDBus/QDBusConnection
include/QtDBus/QDBusConnectionInterface
+include/QtDBus/QDBusContext
include/QtDBus/QDBusError
include/QtDBus/QDBusInterface
include/QtDBus/QDBusMessage
@@ -24,6 +25,7 @@ include/QtDBus/qdbusabstractinterface.h
include/QtDBus/qdbusargument.h
include/QtDBus/qdbusconnection.h
include/QtDBus/qdbusconnectioninterface.h
+include/QtDBus/qdbuscontext.h
include/QtDBus/qdbuserror.h
include/QtDBus/qdbusextratypes.h
include/QtDBus/qdbusinterface.h
@@ -32,12 +34,12 @@ include/QtDBus/qdbusmessage.h
include/QtDBus/qdbusmetatype.h
include/QtDBus/qdbusreply.h
include/QtDBus/qdbusserver.h
-libdata/pkgconfig/QtDBus.pc
lib/libQtDBus.la
lib/libQtDBus.prl
lib/libQtDBus.so
lib/libQtDBus.so.4
-lib/libQtDBus.so.4.2
-lib/libQtDBus.so.4.2.3
-lib/libQtDBus.so.4.2.3.debug
+lib/libQtDBus.so.4.3
+lib/libQtDBus.so.4.3.0
+lib/libQtDBus.so.4.3.0.debug
+libdata/pkgconfig/QtDBus.pc
@dirrm include/QtDBus
diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile
index 4ba4893d6eb6..c85fcc4335de 100644
--- a/devel/qmake4/Makefile
+++ b/devel/qmake4/Makefile
@@ -6,17 +6,17 @@
# $FreeBSD$
PORTNAME= qmake
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_QT}
DISTNAME= qt-x11-opensource-src-${PORTVERSION}
DIST_SUBDIR= KDE
-LATEST_LINK= qmake4
-MAINTAINER= kde@freebsd.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= The build utility of the Qt project
+LATEST_LINK= qmake4
REINPLACE_ARGS= -i ""
WRKSRC= ${WRKDIR}/${DISTNAME}/qmake
MAKEFILE= ${FILESDIR}/Makefile.bsd
@@ -33,7 +33,10 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
'${DISTNAME}/src/corelib/global' \
'${DISTNAME}/src/corelib/plugin' \
'${DISTNAME}/src/corelib/kernel' \
- '${DISTNAME}/src/3rdparty/md5'
+ '${DISTNAME}/src/script' \
+ '${DISTNAME}/src/3rdparty/md4' \
+ '${DISTNAME}/src/3rdparty/md5' \
+ '${DISTNAME}/src/3rdparty/sha1'
.if !defined(NOPORTDOCS)
EXTRACT_AFTER_ARGS+='${DISTNAME}/doc/html/qmake*'
@@ -66,6 +69,7 @@ do-configure:
${ECHO} '/* empty */' > ${WRKSRC}/qconfig.h
${LN} ${WRKSRC}/qconfig.h ${WRKSRC}/../include/QtCore/qconfig.h
+.include "${.CURDIR}/../../Mk/bsd.qt.mk"
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
diff --git a/devel/qmake4/distinfo b/devel/qmake4/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/devel/qmake4/distinfo
+++ b/devel/qmake4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/devel/qmake4/files/Makefile.bsd b/devel/qmake4/files/Makefile.bsd
index dd4e48c651bf..7997e28d17d4 100644
--- a/devel/qmake4/files/Makefile.bsd
+++ b/devel/qmake4/files/Makefile.bsd
@@ -9,11 +9,15 @@ NOMAN= 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/corelib/kernel ${.CURDIR:H}/src/3rdparty/md5 \
+ ${.CURDIR:H}/src/3rdparty/md4 ${.CURDIR:H}/src/3rdparty/sha1 \
+ ${.CURDIR:H}/src/script
+
CXXFLAGS+=-I${.CURDIR:H}/mkspecs/freebsd-g++
.for s in src/corelib/arch/generic src/global src/tools src/kernel src/codecs \
- src/3rdparty/md5 include/QtCore include
+ src/3rdparty/md5 src/3rdparty/md4 src/3rdparty/sha1 \
+ src/script include/QtCore include
CXXFLAGS+=-I${.CURDIR:H}/$s
.endfor
diff --git a/devel/qmake4/pkg-plist b/devel/qmake4/pkg-plist
index 7f00b8484c24..d282c1df166d 100644
--- a/devel/qmake4/pkg-plist
+++ b/devel/qmake4/pkg-plist
@@ -23,6 +23,8 @@ share/qt4/mkspecs/aix-xlc/qmake.conf
share/qt4/mkspecs/aix-xlc/qplatformdefs.h
share/qt4/mkspecs/common/g++.conf
share/qt4/mkspecs/common/linux.conf
+share/qt4/mkspecs/common/mac.conf
+share/qt4/mkspecs/common/mac-g++.conf
share/qt4/mkspecs/common/unix.conf
share/qt4/mkspecs/darwin-g++/qmake.conf
share/qt4/mkspecs/darwin-g++/qplatformdefs.h
@@ -35,11 +37,16 @@ share/qt4/mkspecs/features/default_pre.prf
share/qt4/mkspecs/features/designer.prf
share/qt4/mkspecs/features/dll.prf
share/qt4/mkspecs/features/exclusive_builds.prf
+share/qt4/mkspecs/features/incredibuild_xge.prf
+share/qt4/mkspecs/features/lex.prf
share/qt4/mkspecs/features/link_pkgconfig.prf
share/qt4/mkspecs/features/qdbus.prf
share/qt4/mkspecs/features/qt_functions.prf
+share/qt4/mkspecs/features/mac/dwarf2.prf
share/qt4/mkspecs/features/mac/ppc.prf
+share/qt4/mkspecs/features/mac/ppc64.prf
share/qt4/mkspecs/features/mac/x86.prf
+share/qt4/mkspecs/features/mac/x86_64.prf
share/qt4/mkspecs/features/mac/default_post.prf
share/qt4/mkspecs/features/mac/default_pre.prf
share/qt4/mkspecs/features/mac/objective_c.prf
@@ -61,6 +68,7 @@ share/qt4/mkspecs/features/static_and_shared.prf
share/qt4/mkspecs/features/staticlib.prf
share/qt4/mkspecs/features/uic.prf
share/qt4/mkspecs/features/uitools.prf
+share/qt4/mkspecs/features/unix/bsymbolic_functions.prf
share/qt4/mkspecs/features/unix/dylib.prf
share/qt4/mkspecs/features/unix/hide_symbols.prf
share/qt4/mkspecs/features/unix/largefile.prf
@@ -91,6 +99,7 @@ share/qt4/mkspecs/features/win32/stl_off.prf
share/qt4/mkspecs/features/win32/thread.prf
share/qt4/mkspecs/features/win32/thread_off.prf
share/qt4/mkspecs/features/win32/windows.prf
+share/qt4/mkspecs/features/yacc.prf
share/qt4/mkspecs/freebsd-g++/qmake.conf
share/qt4/mkspecs/freebsd-g++/qplatformdefs.h
share/qt4/mkspecs/freebsd-g++34/qmake.conf
@@ -135,10 +144,12 @@ share/qt4/mkspecs/linux-g++/qmake.conf
share/qt4/mkspecs/linux-g++/qplatformdefs.h
share/qt4/mkspecs/linux-icc/qmake.conf
share/qt4/mkspecs/linux-icc/qplatformdefs.h
+share/qt4/mkspecs/linux-icc-64/qmake.conf
+share/qt4/mkspecs/linux-icc-64/qplatformdefs.h
share/qt4/mkspecs/linux-kcc/qmake.conf
share/qt4/mkspecs/linux-kcc/qplatformdefs.h
-share/qt4/mkspecs/linux-lsb/qmake.conf
-share/qt4/mkspecs/linux-lsb/qplatformdefs.h
+share/qt4/mkspecs/linux-lsb-g++/qmake.conf
+share/qt4/mkspecs/linux-lsb-g++/qplatformdefs.h
share/qt4/mkspecs/linux-pgcc/qmake.conf
share/qt4/mkspecs/linux-pgcc/qplatformdefs.h
share/qt4/mkspecs/lynxos-g++/qmake.conf
@@ -174,6 +185,8 @@ share/qt4/mkspecs/qws/linux-generic-g++-32/qmake.conf
share/qt4/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h
share/qt4/mkspecs/qws/linux-ipaq-g++/qmake.conf
share/qt4/mkspecs/qws/linux-ipaq-g++/qplatformdefs.h
+share/qt4/mkspecs/qws/linux-lsb-g++/qmake.conf
+share/qt4/mkspecs/qws/linux-lsb-g++/qplatformdefs.h
share/qt4/mkspecs/qws/linux-mips-g++/qmake.conf
share/qt4/mkspecs/qws/linux-mips-g++/qplatformdefs.h
share/qt4/mkspecs/qws/linux-sharp-g++/qmake.conf
@@ -228,6 +241,7 @@ share/qt4/mkspecs/win32-g++/qplatformdefs.h
@dirrm share/qt4/mkspecs/qws/linux-x86-g++
@dirrm share/qt4/mkspecs/qws/linux-sharp-g++
@dirrm share/qt4/mkspecs/qws/linux-mips-g++
+@dirrm share/qt4/mkspecs/qws/linux-lsb-g++
@dirrm share/qt4/mkspecs/qws/linux-ipaq-g++
@dirrm share/qt4/mkspecs/qws/linux-generic-g++
@dirrm share/qt4/mkspecs/qws/linux-generic-g++-32
@@ -244,8 +258,9 @@ share/qt4/mkspecs/win32-g++/qplatformdefs.h
@dirrm share/qt4/mkspecs/macx-icc
@dirrm share/qt4/mkspecs/lynxos-g++
@dirrm share/qt4/mkspecs/linux-pgcc
-@dirrm share/qt4/mkspecs/linux-lsb
+@dirrm share/qt4/mkspecs/linux-lsb-g++
@dirrm share/qt4/mkspecs/linux-kcc
+@dirrm share/qt4/mkspecs/linux-icc-64
@dirrm share/qt4/mkspecs/linux-icc
@dirrm share/qt4/mkspecs/linux-g++-64
@dirrm share/qt4/mkspecs/linux-g++-32
diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile
index 4ff30149b466..2d7a925fdf79 100644
--- a/devel/qt4-assistant/Makefile
+++ b/devel/qt4-assistant/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= assistant
-PORTVERSION= 4.2.3
-PORTREVISION= 2
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,31 +18,13 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt documentation browser
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4 \
- rcc:${PORTSDIR}/devel/qt4-rcc \
- uic-qt4:${PORTSDIR}/devel/qt4-uic
-LIB_DEPENDS= Qt3Support:${PORTSDIR}/devel/qt4-qt3support \
- QtCore:${PORTSDIR}/devel/qt4-corelib \
- QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
- QtNetwork:${PORTSDIR}/net/qt4-network \
- QtSql:${PORTSDIR}/databases/qt4-sql \
- QtXml:${PORTSDIR}/textproc/qt4-xml
-RUN_DEPENDS= qt4-doc>=4.2.3:${PORTSDIR}/misc/qt4-doc
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc rcc uic qt3support corelib gui network sql xml doc
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license -no-separate-debug-info
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/devel/qt4-assistant/distinfo b/devel/qt4-assistant/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/devel/qt4-assistant/distinfo
+++ b/devel/qt4-assistant/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/devel/qt4-assistant/pkg-plist b/devel/qt4-assistant/pkg-plist
index 98334ee203db..5d85d93372aa 100644
--- a/devel/qt4-assistant/pkg-plist
+++ b/devel/qt4-assistant/pkg-plist
@@ -1 +1,2 @@
bin/assistant-qt4
+bin/assistant-qt4.debug
diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile
index 769cd8c31740..598a7b9581b7 100644
--- a/devel/qt4-corelib/Makefile
+++ b/devel/qt4-corelib/Makefile
@@ -7,44 +7,27 @@
#
PORTNAME= corelib
-PORTVERSION= 4.2.3
-PORTREVISION= 3
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
DISTNAME= qt-x11-opensource-src-${PORTVERSION}
DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
-COMMENT?= Qt core library
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Qt core library
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4
LIB_DEPENDS= glib-2.0:${PORTSDIR}/devel/glib20
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -confirm-license \
- -prefix ${PREFIX} \
- -docdir ${PREFIX}/share/doc/qt4 \
- -headerdir ${PREFIX}/include \
- -plugindir ${PREFIX}/lib/plugins \
- -datadir ${PREFIX}/share/qt4 \
- -libdir ${PREFIX}/lib \
- -translationdir ${PREFIX}/share/qt4/translations \
- -sysconfdir ${PREFIX}/local/etc/xdg \
- -examplesdir ${PREFIX}/share/qt4/examples \
- -demosdir ${PREFIX}/share/qt4/demos \
- -bindir ${PREFIX}/bin
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
@@ -67,7 +50,7 @@ PATCH_WRKSRC=${WRKSRC}/../../
.include <bsd.port.pre.mk>
pre-configure:
- ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
+ ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \
-e 's|flat_headers.path.*|flat_headers.path=${PREFIX}/include/Qt|g' \
-e 's|targ_headers.path.*|targ_headers.path=${PREFIX}/include/$$$$TARGET|g' \
@@ -76,17 +59,17 @@ pre-configure:
${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/QtCore.pc|${PREFIX}/libdata/pkgconfig/QtCore.pc|g' \
- ${WRKSRC}/Makefile
+ ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+ -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${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/*Qt*
+ ${WRKSRC}/../../lib/pkgconfig/*Qt*
.if !defined(PKGNAMESUFFIX)
post-install:
${MKDIR} ${PREFIX}/lib/plugins
- touch ${PREFIX}/lib/plugins/.keep_me
+ ${TOUCH} ${PREFIX}/lib/plugins/.keep_me
.endif
.include <bsd.port.post.mk>
diff --git a/devel/qt4-corelib/distinfo b/devel/qt4-corelib/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/devel/qt4-corelib/distinfo
+++ b/devel/qt4-corelib/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/devel/qt4-corelib/files/patch-qlocale_workaround_patch.txt b/devel/qt4-corelib/files/patch-qlocale_workaround_patch.txt
deleted file mode 100644
index 2f93298794c9..000000000000
--- a/devel/qt4-corelib/files/patch-qlocale_workaround_patch.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/corelib/tools/qlocale.cpp
-+++ src/corelib/tools/qlocale.cpp
-@@ -44,7 +44,7 @@
-
- #if !defined(QT_QLOCALE_NEEDS_VOLATILE)
- # if defined(Q_CC_GNU)
--# if __GNUC__ == 4 && __GNUC_MINOR__ == 0
-+# if __GNUC__ == 4
- # define QT_QLOCALE_NEEDS_VOLATILE
- # elif defined(Q_OS_WIN)
- # define QT_QLOCALE_NEEDS_VOLATILE
diff --git a/devel/qt4-corelib/files/patch-utf8-bug-qt4 b/devel/qt4-corelib/files/patch-utf8-bug-qt4
deleted file mode 100644
index 4b7ee9c81401..000000000000
--- a/devel/qt4-corelib/files/patch-utf8-bug-qt4
+++ /dev/null
@@ -1,132 +0,0 @@
---- src/corelib/tools/qstring.cpp
-+++ src/corelib/tools/qstring.cpp
-@@ -3342,6 +3342,7 @@ QString QString::fromUtf8(const char *st
- result.resize(size); // worst case
- ushort *qch = result.d->data;
- uint uc = 0;
-+ uint min_uc = 0;
- int need = 0;
- int error = -1;
- uchar ch;
-@@ -3359,6 +3360,12 @@ QString QString::fromUtf8(const char *st
- ushort low = uc%0x400 + 0xdc00;
- *qch++ = high;
- *qch++ = low;
-+ } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+ // overlong seqence, UTF16 surrogate or BOM
-+ i = error;
-+ qch = addOne(qch, result);
-+ *qch++ = 0xdbff;
-+ *qch++ = 0xde00 + ((uchar)str[i]);
- } else {
- *qch++ = uc;
- }
-@@ -3381,14 +3388,17 @@ QString QString::fromUtf8(const char *st
- uc = ch & 0x1f;
- need = 1;
- error = i;
-+ min_uc = 0x80;
- } else if ((ch & 0xf0) == 0xe0) {
- uc = ch & 0x0f;
- need = 2;
- error = i;
-+ min_uc = 0x800;
- } else if ((ch&0xf8) == 0xf0) {
- uc = ch & 0x07;
- need = 3;
- error = i;
-+ min_uc = 0x10000;
- } else {
- // Error
- qch = addOne(qch, result);
---- src/corelib/codecs/qutfcodec.cpp
-+++ src/corelib/codecs/qutfcodec.cpp
-@@ -117,15 +117,19 @@ QString QUtf8Codec::convertToUnicode(con
- bool headerdone = false;
- QChar replacement = QChar::ReplacementCharacter;
- int need = 0;
-+ int error = -1;
- uint uc = 0;
-+ uint min_uc = 0;
- if (state) {
- if (state->flags & IgnoreHeader)
- headerdone = true;
- if (state->flags & ConvertInvalidToNull)
- replacement = QChar::Null;
- need = state->remainingChars;
-- if (need)
-+ if (need) {
- uc = state->state_data[0];
-+ min_uc = state->state_data[1];
-+ }
- }
- if (!headerdone && len > 3
- && (uchar)chars[0] == 0xef && (uchar)chars[1] == 0xbb && (uchar)chars[2] == 0xbf) {
-@@ -142,7 +146,7 @@ QString QUtf8Codec::convertToUnicode(con
- int invalid = 0;
-
- for (int i=0; i<len; i++) {
-- ch = *chars++;
-+ ch = chars[i];
- if (need) {
- if ((ch&0xc0) == 0x80) {
- uc = (uc << 6) | (ch & 0x3f);
-@@ -153,14 +157,27 @@ QString QUtf8Codec::convertToUnicode(con
- uc -= 0x10000;
- unsigned short high = uc/0x400 + 0xd800;
- unsigned short low = uc%0x400 + 0xdc00;
-+
-+ // resize if necessary
-+ long where = qch - result.unicode();
-+ if (where + 2 >= result.size()) {
-+ result.resize(where + 2);
-+ qch = result.data() + where;
-+ }
-+
- *qch++ = QChar(high);
- *qch++ = QChar(low);
-+ } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+ // error
-+ *qch++ = QChar::ReplacementCharacter;
-+ ++invalid;
- } else {
- *qch++ = uc;
- }
- }
- } else {
- // error
-+ i = error;
- *qch++ = QChar::ReplacementCharacter;
- ++invalid;
- need = 0;
-@@ -171,12 +188,22 @@ QString QUtf8Codec::convertToUnicode(con
- } else if ((ch & 0xe0) == 0xc0) {
- uc = ch & 0x1f;
- need = 1;
-+ error = i;
-+ min_uc = 0x80;
- } else if ((ch & 0xf0) == 0xe0) {
- uc = ch & 0x0f;
- need = 2;
-+ error = i;
-+ min_uc = 0x800;
- } else if ((ch&0xf8) == 0xf0) {
- uc = ch & 0x07;
- need = 3;
-+ error = i;
-+ min_uc = 0x10000;
-+ } else {
-+ // error
-+ *qch++ = QChar::ReplacementCharacter;
-+ ++invalid;
- }
- }
- }
-@@ -187,6 +214,7 @@ QString QUtf8Codec::convertToUnicode(con
- if (headerdone)
- state->flags |= IgnoreHeader;
- state->state_data[0] = need ? uc : 0;
-+ state->state_data[1] = need ? min_uc : 0;
- }
- return result;
- }
diff --git a/devel/qt4-corelib/pkg-plist b/devel/qt4-corelib/pkg-plist
index 10346fb33f9e..d3d9433865ce 100644
--- a/devel/qt4-corelib/pkg-plist
+++ b/devel/qt4-corelib/pkg-plist
@@ -33,10 +33,12 @@ include/Qt/qconfig.h
include/Qt/qcontainerfwd.h
include/Qt/qcoreapplication.h
include/Qt/qcoreevent.h
+include/Qt/qcryptographichash.h
include/Qt/qdatastream.h
include/Qt/qdatetime.h
include/Qt/qdebug.h
include/Qt/qdir.h
+include/Qt/qdiriterator.h
include/Qt/qendian.h
include/Qt/qeventloop.h
include/Qt/qfactoryinterface.h
@@ -61,6 +63,7 @@ include/Qt/qmetatype.h
include/Qt/qmimedata.h
include/Qt/qmutex.h
include/Qt/qnamespace.h
+include/Qt/qnumeric.h
include/Qt/qobject.h
include/Qt/qobjectcleanuphandler.h
include/Qt/qobjectdefs.h
@@ -104,6 +107,7 @@ include/Qt/qwaitcondition.h
include/QtCore/QAbstractEventDispatcher
include/QtCore/QAbstractFileEngine
include/QtCore/QAbstractFileEngineHandler
+include/QtCore/QAbstractFileEngineIterator
include/QtCore/QAbstractItemModel
include/QtCore/QAbstractListModel
include/QtCore/QAbstractTableModel
@@ -127,15 +131,18 @@ include/QtCore/QCharRef
include/QtCore/QChildEvent
include/QtCore/QConstString
include/QtCore/QCoreApplication
+include/QtCore/QCryptographicHash
include/QtCore/QCustomEvent
include/QtCore/QDataStream
include/QtCore/QDate
include/QtCore/QDateTime
include/QtCore/QDebug
include/QtCore/QDir
+include/QtCore/QDirIterator
include/QtCore/QDynamicPropertyChangeEvent
include/QtCore/QEvent
include/QtCore/QEventLoop
+include/QtCore/QExplicitlySharedDataPointer
include/QtCore/QFSFileEngine
include/QtCore/QFactoryInterface
include/QtCore/QFile
@@ -150,6 +157,7 @@ include/QtCore/QForeachContainerBase
include/QtCore/QGenericArgument
include/QtCore/QGenericReturnArgument
include/QtCore/QGlobalStatic
+include/QtCore/QGlobalStaticDeleter
include/QtCore/QHash
include/QtCore/QHashData
include/QtCore/QHashDummyNode
@@ -237,6 +245,7 @@ include/QtCore/QString
include/QtCore/QStringList
include/QtCore/QStringListIterator
include/QtCore/QStringMatcher
+include/QtCore/QStringRef
include/QtCore/QSysInfo
include/QtCore/QSystemLocale
include/QtCore/QTS
@@ -333,10 +342,12 @@ include/QtCore/qconfig.h
include/QtCore/qcontainerfwd.h
include/QtCore/qcoreapplication.h
include/QtCore/qcoreevent.h
+include/QtCore/qcryptographichash.h
include/QtCore/qdatastream.h
include/QtCore/qdatetime.h
include/QtCore/qdebug.h
include/QtCore/qdir.h
+include/QtCore/qdiriterator.h
include/QtCore/qendian.h
include/QtCore/qeventloop.h
include/QtCore/qfactoryinterface.h
@@ -361,6 +372,7 @@ include/QtCore/qmetatype.h
include/QtCore/qmimedata.h
include/QtCore/qmutex.h
include/QtCore/qnamespace.h
+include/QtCore/qnumeric.h
include/QtCore/qobject.h
include/QtCore/qobjectcleanuphandler.h
include/QtCore/qobjectdefs.h
@@ -405,9 +417,8 @@ lib/libQtCore.la
lib/libQtCore.prl
lib/libQtCore.so
lib/libQtCore.so.4
-lib/libQtCore.so.4.2
-lib/libQtCore.so.4.2.3
-lib/libQtCore.so.4.2.3.debug
+lib/libQtCore.so.4.3
+lib/libQtCore.so.4.3.0
lib/plugins/.keep_me
libdata/pkgconfig/QtCore.pc
@dirrmtry share/qt4
diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile
index a0e889c46958..6a4d4815f671 100644
--- a/devel/qt4-designer/Makefile
+++ b/devel/qt4-designer/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= designer
-PORTVERSION= 4.2.3
-PORTREVISION= 3
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,32 +18,15 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt ui editor
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4 \
- rcc:${PORTSDIR}/devel/qt4-rcc \
- uic-qt4:${PORTSDIR}/devel/qt4-uic
-LIB_DEPENDS= QtAssistantClient:${PORTSDIR}/devel/qt4-libqtassistantclient \
- Qt3Support:${PORTSDIR}/devel/qt4-qt3support \
- QtCore:${PORTSDIR}/devel/qt4-corelib \
- QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
- QtNetwork:${PORTSDIR}/net/qt4-network \
- QtSql:${PORTSDIR}/databases/qt4-sql \
- QtXml:${PORTSDIR}/textproc/qt4-xml
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc rcc uic assistantclient qt3support corelib gui network\
+ script sql xml
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
@@ -62,7 +45,7 @@ CONFIGURE_WRKSRC=${WRKSRC}/../../
.include <bsd.port.pre.mk>
pre-configure:
- ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
+ ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \
-e 's|^TARGET.*|TARGET=designer-qt4|g' \
${WRKSRC}/src/designer/${PORTNAME}.pro
@@ -79,10 +62,11 @@ pre-configure:
${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc
post-configure:
- ${REINPLACE_CMD} -e 's|.*$$(QMAKE).*||g' ${WRKSRC}/src/uitools/Makefile
+ ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+ -e 's|.*$$(QMAKE).*||g' ${WRKSRC}/src/uitools/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/*Qt*
+ ${WRKSRC}/../../lib/pkgconfig/*Qt*
.include <bsd.port.post.mk>
diff --git a/devel/qt4-designer/distinfo b/devel/qt4-designer/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/devel/qt4-designer/distinfo
+++ b/devel/qt4-designer/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/devel/qt4-designer/pkg-plist b/devel/qt4-designer/pkg-plist
index ea84579a1a87..5441f3ec4714 100644
--- a/devel/qt4-designer/pkg-plist
+++ b/devel/qt4-designer/pkg-plist
@@ -10,6 +10,7 @@ include/QtDesigner/QDesignerContainerExtension
include/QtDesigner/QDesignerCustomWidgetCollectionInterface
include/QtDesigner/QDesignerCustomWidgetInterface
include/QtDesigner/QDesignerDnDItemInterface
+include/QtDesigner/QDesignerDynamicPropertySheetExtension
include/QtDesigner/QDesignerExportWidget
include/QtDesigner/QDesignerExtraInfoExtension
include/QtDesigner/QDesignerFormEditorInterface
@@ -19,14 +20,17 @@ include/QtDesigner/QDesignerFormWindowInterface
include/QtDesigner/QDesignerFormWindowManagerInterface
include/QtDesigner/QDesignerFormWindowToolInterface
include/QtDesigner/QDesignerIconCacheInterface
+include/QtDesigner/QDesignerIntegrationInterface
include/QtDesigner/QDesignerLanguageExtension
include/QtDesigner/QDesignerLayoutDecorationExtension
include/QtDesigner/QDesignerMemberSheetExtension
include/QtDesigner/QDesignerMetaDataBaseInterface
include/QtDesigner/QDesignerMetaDataBaseItemInterface
include/QtDesigner/QDesignerObjectInspectorInterface
+include/QtDesigner/QDesignerPromotionInterface
include/QtDesigner/QDesignerPropertyEditorInterface
include/QtDesigner/QDesignerPropertySheetExtension
+include/QtDesigner/QDesignerResourceBrowserInterface
include/QtDesigner/QDesignerTaskMenuExtension
include/QtDesigner/QDesignerWidgetBoxInterface
include/QtDesigner/QDesignerWidgetDataBaseInterface
@@ -47,16 +51,20 @@ include/QtDesigner/abstractformwindowcursor.h
include/QtDesigner/abstractformwindowmanager.h
include/QtDesigner/abstractformwindowtool.h
include/QtDesigner/abstracticoncache.h
+include/QtDesigner/abstractintegration.h
include/QtDesigner/abstractlanguage.h
include/QtDesigner/abstractmetadatabase.h
include/QtDesigner/abstractobjectinspector.h
+include/QtDesigner/abstractpromotioninterface.h
include/QtDesigner/abstractpropertyeditor.h
+include/QtDesigner/abstractresourcebrowser.h
include/QtDesigner/abstractwidgetbox.h
include/QtDesigner/abstractwidgetdatabase.h
include/QtDesigner/abstractwidgetfactory.h
include/QtDesigner/container.h
include/QtDesigner/customwidget.h
include/QtDesigner/default_extensionfactory.h
+include/QtDesigner/dynamicpropertysheet.h
include/QtDesigner/extension.h
include/QtDesigner/extension_global.h
include/QtDesigner/extrainfo.h
@@ -77,18 +85,19 @@ include/QtUiTools/quiloader.h
lib/libQtDesigner.prl
lib/libQtDesigner.so
lib/libQtDesigner.so.4
-lib/libQtDesigner.so.4.2
-lib/libQtDesigner.so.4.2.3
-lib/libQtDesigner.so.4.2.3.debug
+lib/libQtDesigner.so.4.3
+lib/libQtDesigner.so.4.3.0
+lib/libQtDesigner.so.4.3.0.debug
lib/libQtDesignerComponents.prl
lib/libQtDesignerComponents.so
lib/libQtDesignerComponents.so.4
-lib/libQtDesignerComponents.so.4.2
-lib/libQtDesignerComponents.so.4.2.3
-lib/libQtDesignerComponents.so.4.2.3.debug
+lib/libQtDesignerComponents.so.4.3
+lib/libQtDesignerComponents.so.4.3.0
+lib/libQtDesignerComponents.so.4.3.0.debug
lib/libQtUiTools.a
lib/libQtUiTools.prl
lib/plugins/libqt3supportwidgets.so
lib/plugins/libqt3supportwidgets.so.debug
+libdata/pkgconfig/QtUiTools.pc
@dirrm include/QtUiTools
@dirrm include/QtDesigner
diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile
index f45083de0ca6..255dfd469c26 100644
--- a/devel/qt4-libqtassistantclient/Makefile
+++ b/devel/qt4-libqtassistantclient/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= libQtAssistantClient
-PORTVERSION= 4.2.3
-PORTREVISION= 2
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,27 +18,14 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt documentation browser integration library
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4
-
-LIB_DEPENDS= QtCore:${PORTSDIR}/devel/qt4-corelib \
- QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
- QtNetwork:${PORTSDIR}/net/qt4-network
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc corelib gui network
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
@@ -67,4 +54,12 @@ pre-configure:
${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/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+ -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${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/*Qt*
+
.include <bsd.port.mk>
diff --git a/devel/qt4-libqtassistantclient/distinfo b/devel/qt4-libqtassistantclient/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/devel/qt4-libqtassistantclient/distinfo
+++ b/devel/qt4-libqtassistantclient/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/devel/qt4-libqtassistantclient/pkg-plist b/devel/qt4-libqtassistantclient/pkg-plist
index db1d832e3410..32f134063776 100644
--- a/devel/qt4-libqtassistantclient/pkg-plist
+++ b/devel/qt4-libqtassistantclient/pkg-plist
@@ -5,7 +5,7 @@ include/QtAssistant/qassistantclient_global.h
lib/libQtAssistantClient.prl
lib/libQtAssistantClient.so
lib/libQtAssistantClient.so.4
-lib/libQtAssistantClient.so.4.2
-lib/libQtAssistantClient.so.4.2.3
-lib/libQtAssistantClient.so.4.2.3.debug
+lib/libQtAssistantClient.so.4.3
+lib/libQtAssistantClient.so.4.3.0
+libdata/pkgconfig/QtAssistantClient.pc
@dirrm include/QtAssistant
diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile
index 48baee29b381..4941696f0255 100644
--- a/devel/qt4-linguist/Makefile
+++ b/devel/qt4-linguist/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= linguist
-PORTVERSION= 4.2.3
-PORTREVISION= 3
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,29 +18,13 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt localisation tool
-BUILD_DEPENDS= ${LOCALBASE}/lib/libQtUiTools.a:${PORTSDIR}/devel/qt4-designer \
- moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4 \
- rcc:${PORTSDIR}/devel/qt4-rcc \
- uic-qt4:${PORTSDIR}/devel/qt4-uic
-LIB_DEPENDS= QtAssistantClient:${PORTSDIR}/devel/qt4-libqtassistantclient \
- QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
- QtNetwork:${PORTSDIR}/net/qt4-network \
- QtXml:${PORTSDIR}/textproc/qt4-xml
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake designer moc rcc uic assistantclient gui network xml
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/devel/qt4-linguist/distinfo b/devel/qt4-linguist/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/devel/qt4-linguist/distinfo
+++ b/devel/qt4-linguist/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/devel/qt4-linguist/pkg-plist b/devel/qt4-linguist/pkg-plist
index 7b11182b2282..e629ea1c49be 100644
--- a/devel/qt4-linguist/pkg-plist
+++ b/devel/qt4-linguist/pkg-plist
@@ -10,6 +10,7 @@ share/qt4/phrasebooks/finnish.qph
share/qt4/phrasebooks/french.qph
share/qt4/phrasebooks/german.qph
share/qt4/phrasebooks/italian.qph
+share/qt4/phrasebooks/japanese.qph
share/qt4/phrasebooks/norwegian.qph
share/qt4/phrasebooks/russian.qph
share/qt4/phrasebooks/spanish.qph
diff --git a/devel/qt4-makeqpf/Makefile b/devel/qt4-makeqpf/Makefile
new file mode 100644
index 000000000000..85274db8ef62
--- /dev/null
+++ b/devel/qt4-makeqpf/Makefile
@@ -0,0 +1,55 @@
+# -*-mode: makefile-*-
+# New ports collection makefile for: qt40
+# Date created: Wed Jun 29 11:49:42 CEST 2005
+# Whom: lofi@freebsd.org
+#
+# $FreeBSD$
+#
+
+PORTNAME= makeqpf
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
+CATEGORIES?= devel
+MASTER_SITES= ${MASTER_SITE_QT}
+PKGNAMEPREFIX= qt4-
+DISTNAME= qt-x11-opensource-src-${PORTVERSION}
+DIST_SUBDIR= KDE
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Qt qtopia font creator
+
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc rcc uic corelib gui
+QT_NONSTANDARD= yes
+QT_DIST= yes
+
+HAS_CONFIGURE= yes
+
+ALL_TARGET= first
+CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
+MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
+ PATH=${WRKSRC}/bin:$$PATH
+EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
+ --exclude '${DISTNAME}/mkspecs' --exclude '${DISTNAME}/qmake' \
+ --exclude '${DISTNAME}/demos' --exclude '${DISTNAME}/examples' \
+ --exclude '${DISTNAME}/src/opengl' --exclude '${DISTNAME}/src/qt3support' \
+ --exclude '${DISTNAME}/src/sql' --exclude '${DISTNAME}/src/plugins' \
+ --exclude '${DISTNAME}/src/3rdparty' --exclude '${DISTNAME}/src/tools/moc' \
+ --exclude '${DISTNAME}/src/tools/rcc' --exclude '${DISTNAME}/src/tools/uic' \
+ --exclude '${DISTNAME}/src/tools/uic3' --exclude '${DISTNAME}/tools/porting' \
+ --exclude '${DISTNAME}/tools/qtconfig' --exclude '${DISTNAME}/tools/qvfb'
+WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME}
+CONFIGURE_WRKSRC=${WRKSRC}/../../
+
+pre-configure:
+ ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
+ ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \
+ -E -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
+
+.include <bsd.port.mk>
diff --git a/devel/qt4-makeqpf/distinfo b/devel/qt4-makeqpf/distinfo
new file mode 100644
index 000000000000..8fb631a2787d
--- /dev/null
+++ b/devel/qt4-makeqpf/distinfo
@@ -0,0 +1,3 @@
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/devel/qt4-makeqpf/files/patch-tools-makeqpf-qpf2.cpp b/devel/qt4-makeqpf/files/patch-tools-makeqpf-qpf2.cpp
new file mode 100644
index 000000000000..e91adeeccea1
--- /dev/null
+++ b/devel/qt4-makeqpf/files/patch-tools-makeqpf-qpf2.cpp
@@ -0,0 +1,11 @@
+--- qpf2.cpp Sun Jul 8 08:08:09 2007
++++ qpf2.cpp Sun Jul 8 08:08:33 2007
+@@ -342,6 +342,8 @@
+ int startGlyphIndex;
+ };
+
++#define log2(x) log(x)/log(2)
++
+ static QByteArray generateTrueTypeCMap(QFontEngine *fe)
+ {
+ QByteArray cmap;
diff --git a/devel/qt4-makeqpf/pkg-descr b/devel/qt4-makeqpf/pkg-descr
new file mode 100644
index 000000000000..efc79b9aaf24
--- /dev/null
+++ b/devel/qt4-makeqpf/pkg-descr
@@ -0,0 +1,12 @@
+Qt is a C++ toolkit for application development. It lets application
+developers target all major operating systems with a single application
+source code.
+
+Qt provides a platform-independent API to all central platform functionality:
+GUI, database access, networking, file handling, etc. The Qt library
+encapsulates the different APIs of different operating systems, providing
+the application programmer with a single, common API for all operating systems.
+The native C APIs are encapsulated in a set of well-designed, fully
+object-oriented C++ classes.
+
+WWW: http://www.trolltech.com/products/qt/index.html
diff --git a/devel/qt4-makeqpf/pkg-plist b/devel/qt4-makeqpf/pkg-plist
new file mode 100644
index 000000000000..e559beaa3c72
--- /dev/null
+++ b/devel/qt4-makeqpf/pkg-plist
@@ -0,0 +1,2 @@
+bin/makeqpf-qt4
+bin/makeqpf-qt4.debug
diff --git a/devel/qt4-moc/Makefile b/devel/qt4-moc/Makefile
index 0e76b1f634f9..95224e8c61bc 100644
--- a/devel/qt4-moc/Makefile
+++ b/devel/qt4-moc/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= moc
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,21 +18,13 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt meta object compiler
-BUILD_DEPENDS= qmake-qt4:${PORTSDIR}/devel/qmake4
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/devel/qt4-moc/distinfo b/devel/qt4-moc/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/devel/qt4-moc/distinfo
+++ b/devel/qt4-moc/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/devel/qt4-porting/Makefile b/devel/qt4-porting/Makefile
index 31813805ad82..bea665729817 100644
--- a/devel/qt4-porting/Makefile
+++ b/devel/qt4-porting/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= porting
-PORTVERSION= 4.2.3
+PORTVERSION= ${QT4_VERSION}
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -17,26 +17,13 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt utility to assist with porting Qt3 applications to Qt4
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4 \
- rcc:${PORTSDIR}/devel/qt4-rcc \
- uic-qt4:${PORTSDIR}/devel/qt4-uic
-LIB_DEPENDS= QtCore:${PORTSDIR}/devel/qt4-corelib \
- QtXml:${PORTSDIR}/textproc/qt4-xml
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc rcc uic corelib xml
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
@@ -57,7 +44,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME}
CONFIGURE_WRKSRC=${WRKSRC}/../../
pre-configure:
- ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
+ ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \
-e 's|RULESXML.path.*|RULESXML.path=${PREFIX}/share/qt4|g' \
${WRKSRC}/${PORTNAME}.pro ${WRKSRC}/src/src.pro
diff --git a/devel/qt4-porting/distinfo b/devel/qt4-porting/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/devel/qt4-porting/distinfo
+++ b/devel/qt4-porting/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/devel/qt4-qdbusviewer/Makefile b/devel/qt4-qdbusviewer/Makefile
new file mode 100644
index 000000000000..b5e988b6e5b3
--- /dev/null
+++ b/devel/qt4-qdbusviewer/Makefile
@@ -0,0 +1,57 @@
+### -*-mode: makefile-*-
+# New ports collection makefile for: qt40
+# Date created: Wed Jun 29 11:49:42 CEST 2005
+# Whom: lofi@freebsd.org
+#
+# $FreeBSD$
+#
+
+PORTNAME= qdbusviewer
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
+CATEGORIES?= devel
+MASTER_SITES= ${MASTER_SITE_QT}
+PKGNAMEPREFIX= qt4-
+DISTNAME= qt-x11-opensource-src-${PORTVERSION}
+DIST_SUBDIR= KDE
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Qt4 D-BUS viewer
+
+LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus
+
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc rcc corelib dbus gui xml
+QT_NONSTANDARD= yes
+QT_DIST= yes
+
+HAS_CONFIGURE= yes
+USE_LDCONFIG= yes
+
+ALL_TARGET= first
+CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
+MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
+ PATH=${WRKSRC}/bin:$$PATH
+EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
+ --exclude '${DISTNAME}/mkspecs' --exclude '${DISTNAME}/qmake' \
+ --exclude '${DISTNAME}/demos' --exclude '${DISTNAME}/examples' \
+ --exclude '${DISTNAME}/src/opengl' --exclude '${DISTNAME}/src/sql' \
+ --exclude '${DISTNAME}/src/tools/moc' --exclude '${DISTNAME}/src/tools/rcc' \
+ --exclude '${DISTNAME}/src/tools/uic3' --exclude '${DISTNAME}/tools/designer' \
+ --exclude '${DISTNAME}/tools/linguist' --exclude '${DISTNAME}/tools/porting' \
+ --exclude '${DISTNAME}/tools/qtconfig' --exclude '${DISTNAME}/tools/qvfb'
+WRKSRC= ${WRKDIR}/${DISTNAME}/tools/qdbus/tools/qdbusviewer
+CONFIGURE_WRKSRC=${WRKSRC}/../../../..
+
+.include <bsd.port.pre.mk>
+
+pre-configure:
+ ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
+ ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \
+ ${WRKSRC}/qdbusviewer.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/rcc ${WRKSRC}/../../../../bin/rcc
+
+.include <bsd.port.post.mk>
diff --git a/devel/qt4-qdbusviewer/distinfo b/devel/qt4-qdbusviewer/distinfo
new file mode 100644
index 000000000000..8fb631a2787d
--- /dev/null
+++ b/devel/qt4-qdbusviewer/distinfo
@@ -0,0 +1,3 @@
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/devel/qt4-qdbusviewer/pkg-descr b/devel/qt4-qdbusviewer/pkg-descr
new file mode 100644
index 000000000000..efc79b9aaf24
--- /dev/null
+++ b/devel/qt4-qdbusviewer/pkg-descr
@@ -0,0 +1,12 @@
+Qt is a C++ toolkit for application development. It lets application
+developers target all major operating systems with a single application
+source code.
+
+Qt provides a platform-independent API to all central platform functionality:
+GUI, database access, networking, file handling, etc. The Qt library
+encapsulates the different APIs of different operating systems, providing
+the application programmer with a single, common API for all operating systems.
+The native C APIs are encapsulated in a set of well-designed, fully
+object-oriented C++ classes.
+
+WWW: http://www.trolltech.com/products/qt/index.html
diff --git a/devel/qt4-qdbusviewer/pkg-plist b/devel/qt4-qdbusviewer/pkg-plist
new file mode 100644
index 000000000000..1eb0a48e3608
--- /dev/null
+++ b/devel/qt4-qdbusviewer/pkg-plist
@@ -0,0 +1,2 @@
+bin/qdbusviewer
+bin/qdbusviewer.debug
diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile
index f6e189ac19de..473b56cbe5fd 100644
--- a/devel/qt4-qt3support/Makefile
+++ b/devel/qt4-qt3support/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= qt3support
-PORTVERSION= 4.2.3
-PORTREVISION= 2
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= devel x11-toolkits
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,29 +18,15 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt3 compatibility library
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4
-LIB_DEPENDS?= QtCore:${PORTSDIR}/devel/qt4-corelib \
- QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
- QtNetwork:${PORTSDIR}/net/qt4-network \
- QtSql:${PORTSDIR}/databases/qt4-sql \
- QtXml:${PORTSDIR}/textproc/qt4-xml
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc corelib gui network sql xml
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
USE_XLIB= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
@@ -70,11 +56,11 @@ pre-configure:
${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/Qt3Support.pc|${PREFIX}/libdata/pkgconfig/Qt3Support.pc|g' \
+ ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-e 's|.*$$(QMAKE).*||g' ${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/*Qt*
+ ${WRKSRC}/../../lib/pkgconfig/*Qt*
.include <bsd.port.post.mk>
diff --git a/devel/qt4-qt3support/distinfo b/devel/qt4-qt3support/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/devel/qt4-qt3support/distinfo
+++ b/devel/qt4-qt3support/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/devel/qt4-qt3support/pkg-plist b/devel/qt4-qt3support/pkg-plist
index b1dbe4283419..002aca07c933 100644
--- a/devel/qt4-qt3support/pkg-plist
+++ b/devel/qt4-qt3support/pkg-plist
@@ -405,8 +405,8 @@ lib/libQt3Support.la
lib/libQt3Support.prl
lib/libQt3Support.so
lib/libQt3Support.so.4
-lib/libQt3Support.so.4.2
-lib/libQt3Support.so.4.2.3
-lib/libQt3Support.so.4.2.3.debug
+lib/libQt3Support.so.4.3
+lib/libQt3Support.so.4.3.0
+lib/libQt3Support.so.4.3.0.debug
libdata/pkgconfig/Qt3Support.pc
@dirrm include/Qt3Support
diff --git a/devel/qt4-qtestlib/Makefile b/devel/qt4-qtestlib/Makefile
index 8c50a64a0485..cb7dd4b4b535 100644
--- a/devel/qt4-qtestlib/Makefile
+++ b/devel/qt4-qtestlib/Makefile
@@ -7,36 +7,25 @@
#
PORTNAME= qtestlib
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
DISTNAME= qt-x11-opensource-src-${PORTVERSION}
DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
-COMMENT?= Qt unit testing library
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Qt unit testing library
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4
-
-LIB_DEPENDS= QtCore:${PORTSDIR}/devel/qt4-corelib
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc corelib
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
@@ -58,7 +47,7 @@ CONFIGURE_WRKSRC=${WRKSRC}/../../
.include <bsd.port.pre.mk>
pre-configure:
- ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
+ ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \
-e 's|qtestlib_headers.path.*|targ_headers.path=${PREFIX}/include/$$$$TARGET|g' \
${WRKSRC}/${PORTNAME}.pro
@@ -66,11 +55,11 @@ pre-configure:
${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/QtTest.pc|${PREFIX}/libdata/pkgconfig/QtTest.pc|g' \
- ${WRKSRC}/src/Makefile
+ ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+ -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${WRKSRC}/src/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/*Qt*
+ ${WRKSRC}/../../lib/pkgconfig/*Qt*
.include <bsd.port.post.mk>
diff --git a/devel/qt4-qtestlib/distinfo b/devel/qt4-qtestlib/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/devel/qt4-qtestlib/distinfo
+++ b/devel/qt4-qtestlib/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/devel/qt4-qtestlib/pkg-plist b/devel/qt4-qtestlib/pkg-plist
index 6c376ae53107..373b663d75df 100644
--- a/devel/qt4-qtestlib/pkg-plist
+++ b/devel/qt4-qtestlib/pkg-plist
@@ -27,12 +27,11 @@ include/QtTest/qtestkeyboard.h
include/QtTest/qtestmouse.h
include/QtTest/qtestspontaneevent.h
include/QtTest/qtestsystem.h
-libdata/pkgconfig/QtTest.pc
lib/libQtTest.la
lib/libQtTest.prl
lib/libQtTest.so
lib/libQtTest.so.4
-lib/libQtTest.so.4.2
-lib/libQtTest.so.4.2.3
-lib/libQtTest.so.4.2.3.debug
+lib/libQtTest.so.4.3
+lib/libQtTest.so.4.3.0
+libdata/pkgconfig/QtTest.pc
@dirrm include/QtTest
diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile
index e8f016d1d19d..f12215ffc1a2 100644
--- a/devel/qt4-qvfb/Makefile
+++ b/devel/qt4-qvfb/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= qvfb
-PORTVERSION= 4.2.3
-PORTREVISION= 2
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,27 +18,13 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt virtual framebuffer utility
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4 \
- rcc:${PORTSDIR}/devel/qt4-rcc \
- uic-qt4:${PORTSDIR}/devel/qt4-uic
-LIB_DEPENDS= QtCore:${PORTSDIR}/devel/qt4-corelib \
- QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
- QtOpenGL:${PORTSDIR}/x11/qt4-opengl
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc rcc uic corelib gui opengl
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
@@ -54,7 +40,7 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
--exclude '${DISTNAME}/src/tools/uic' --exclude '${DISTNAME}/src/tools/uic3' \
--exclude '${DISTNAME}/tools/assistant' --exclude '${DISTNAME}/tools/designer' \
--exclude '${DISTNAME}/tools/linguist' --exclude '${DISTNAME}/tools/porting' \
- --exclude '${DISTNAME}/tools/qtconfig'
+ --exclude '${DISTNAME}/tools/qtconfig'
WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME}
CONFIGURE_WRKSRC=${WRKSRC}/../../
diff --git a/devel/qt4-qvfb/distinfo b/devel/qt4-qvfb/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/devel/qt4-qvfb/distinfo
+++ b/devel/qt4-qvfb/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/devel/qt4-qvfb/files/patch-qvfbshmem.cpp b/devel/qt4-qvfb/files/patch-qvfbshmem.cpp
deleted file mode 100644
index aaa4c8a6dd57..000000000000
--- a/devel/qt4-qvfb/files/patch-qvfbshmem.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- qvfbshmem.cpp.orig Sun Jan 14 15:50:33 2007
-+++ qvfbshmem.cpp Sun Jan 14 15:50:46 2007
-@@ -39,7 +39,7 @@
- #include <sys/stat.h>
- #include <sys/sem.h>
- #include <sys/mman.h>
--#include <asm/page.h>
-+#include <machine/param.h>
- #include <fcntl.h>
- #include <errno.h>
- #include <math.h>
diff --git a/devel/qt4-qvfb/files/patch-qwssignalhandler.cpp b/devel/qt4-qvfb/files/patch-qwssignalhandler.cpp
deleted file mode 100644
index 364c289a41f5..000000000000
--- a/devel/qt4-qvfb/files/patch-qwssignalhandler.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- qwssignalhandler.cpp.orig Thu Mar 22 16:17:51 2007
-+++ qwssignalhandler.cpp Thu Mar 22 16:18:10 2007
-@@ -27,13 +27,6 @@
- #include <sys/ipc.h>
- #include <sys/sem.h>
-
--union semun {
-- int val;
-- struct semid_ds *buf;
-- unsigned short *array;
-- struct seminfo *__buf;
--};
--
- class QWSSignalHandlerPrivate
- {
- public:
diff --git a/devel/qt4-qvfb/pkg-plist b/devel/qt4-qvfb/pkg-plist
index 9da8e06f6cf8..ae5639ce4ec3 100644
--- a/devel/qt4-qvfb/pkg-plist
+++ b/devel/qt4-qvfb/pkg-plist
@@ -1,61 +1,61 @@
bin/qvfb-qt4
bin/qvfb-qt4.debug
-share/qvfb/ClamshellPhone.skin/ClamshellPhone.skin
-share/qvfb/ClamshellPhone.skin/ClamshellPhone1-5-closed.png
-share/qvfb/ClamshellPhone.skin/ClamshellPhone1-5-pressed.png
-share/qvfb/ClamshellPhone.skin/ClamshellPhone1-5.png
-share/qvfb/ClamshellPhone.skin/defaultbuttons.conf
-share/qvfb/DualScreenPhone.skin/DualScreen-pressed.png
-share/qvfb/DualScreenPhone.skin/DualScreen.png
-share/qvfb/DualScreenPhone.skin/DualScreenPhone.skin
-share/qvfb/DualScreenPhone.skin/defaultbuttons.conf
-share/qvfb/PDAPhone.skin/PDAPhone.skin
-share/qvfb/PDAPhone.skin/defaultbuttons.conf
-share/qvfb/PDAPhone.skin/finger.png
-share/qvfb/PDAPhone.skin/pda_down.png
-share/qvfb/PDAPhone.skin/pda_up.png
-share/qvfb/PortableMedia.skin/PortableMedia.skin
-share/qvfb/PortableMedia.skin/defaultbuttons.conf
-share/qvfb/PortableMedia.skin/portablemedia-pressed.png
-share/qvfb/PortableMedia.skin/portablemedia.png
-share/qvfb/PortableMedia.skin/portablemedia.xcf
-share/qvfb/SmartPhone.skin/SmartPhone-pressed.png
-share/qvfb/SmartPhone.skin/SmartPhone.png
-share/qvfb/SmartPhone.skin/SmartPhone.skin
-share/qvfb/SmartPhone.skin/defaultbuttons.conf
-share/qvfb/SmartPhone2.skin/SmartPhone2-pressed.png
-share/qvfb/SmartPhone2.skin/SmartPhone2.png
-share/qvfb/SmartPhone2.skin/SmartPhone2.skin
-share/qvfb/SmartPhone2.skin/defaultbuttons.conf
-share/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons-pressed.png
-share/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.png
-share/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.skin
-share/qvfb/SmartPhoneWithButtons.skin/defaultbuttons.conf
-share/qvfb/TouchscreenPhone.skin/TouchscreenPhone-pressed.png
-share/qvfb/TouchscreenPhone.skin/TouchscreenPhone.png
-share/qvfb/TouchscreenPhone.skin/TouchscreenPhone.skin
-share/qvfb/TouchscreenPhone.skin/defaultbuttons.conf
-share/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad-closed.png
-share/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad-down.png
-share/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad.png
-share/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad.skin
-share/qvfb/Trolltech-Keypad.skin/defaultbuttons.conf
-share/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen-down.png
-share/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.png
-share/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.skin
-share/qvfb/Trolltech-Touchscreen.skin/defaultbuttons.conf
-share/qvfb/pda.qrc
-share/qvfb/pda.skin
-share/qvfb/pda_down.png
-share/qvfb/pda_up.png
-@dirrm share/qvfb/Trolltech-Touchscreen.skin
-@dirrm share/qvfb/Trolltech-Keypad.skin
-@dirrm share/qvfb/TouchscreenPhone.skin
-@dirrm share/qvfb/SmartPhoneWithButtons.skin
-@dirrm share/qvfb/SmartPhone2.skin
-@dirrm share/qvfb/SmartPhone.skin
-@dirrm share/qvfb/PortableMedia.skin
-@dirrm share/qvfb/PDAPhone.skin
-@dirrm share/qvfb/DualScreenPhone.skin
-@dirrm share/qvfb/ClamshellPhone.skin
-@dirrm share/qvfb
+%%DATADIR%%/ClamshellPhone.skin/ClamshellPhone.skin
+%%DATADIR%%/ClamshellPhone.skin/ClamshellPhone1-5-closed.png
+%%DATADIR%%/ClamshellPhone.skin/ClamshellPhone1-5-pressed.png
+%%DATADIR%%/ClamshellPhone.skin/ClamshellPhone1-5.png
+%%DATADIR%%/ClamshellPhone.skin/defaultbuttons.conf
+%%DATADIR%%/DualScreenPhone.skin/DualScreen-pressed.png
+%%DATADIR%%/DualScreenPhone.skin/DualScreen.png
+%%DATADIR%%/DualScreenPhone.skin/DualScreenPhone.skin
+%%DATADIR%%/DualScreenPhone.skin/defaultbuttons.conf
+%%DATADIR%%/PDAPhone.skin/PDAPhone.skin
+%%DATADIR%%/PDAPhone.skin/defaultbuttons.conf
+%%DATADIR%%/PDAPhone.skin/finger.png
+%%DATADIR%%/PDAPhone.skin/pda_down.png
+%%DATADIR%%/PDAPhone.skin/pda_up.png
+%%DATADIR%%/PortableMedia.skin/PortableMedia.skin
+%%DATADIR%%/PortableMedia.skin/defaultbuttons.conf
+%%DATADIR%%/PortableMedia.skin/portablemedia-pressed.png
+%%DATADIR%%/PortableMedia.skin/portablemedia.png
+%%DATADIR%%/PortableMedia.skin/portablemedia.xcf
+%%DATADIR%%/SmartPhone.skin/SmartPhone-pressed.png
+%%DATADIR%%/SmartPhone.skin/SmartPhone.png
+%%DATADIR%%/SmartPhone.skin/SmartPhone.skin
+%%DATADIR%%/SmartPhone.skin/defaultbuttons.conf
+%%DATADIR%%/SmartPhone2.skin/SmartPhone2-pressed.png
+%%DATADIR%%/SmartPhone2.skin/SmartPhone2.png
+%%DATADIR%%/SmartPhone2.skin/SmartPhone2.skin
+%%DATADIR%%/SmartPhone2.skin/defaultbuttons.conf
+%%DATADIR%%/SmartPhoneWithButtons.skin/SmartPhoneWithButtons-pressed.png
+%%DATADIR%%/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.png
+%%DATADIR%%/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.skin
+%%DATADIR%%/SmartPhoneWithButtons.skin/defaultbuttons.conf
+%%DATADIR%%/TouchscreenPhone.skin/TouchscreenPhone-pressed.png
+%%DATADIR%%/TouchscreenPhone.skin/TouchscreenPhone.png
+%%DATADIR%%/TouchscreenPhone.skin/TouchscreenPhone.skin
+%%DATADIR%%/TouchscreenPhone.skin/defaultbuttons.conf
+%%DATADIR%%/Trolltech-Keypad.skin/Trolltech-Keypad-closed.png
+%%DATADIR%%/Trolltech-Keypad.skin/Trolltech-Keypad-down.png
+%%DATADIR%%/Trolltech-Keypad.skin/Trolltech-Keypad.png
+%%DATADIR%%/Trolltech-Keypad.skin/Trolltech-Keypad.skin
+%%DATADIR%%/Trolltech-Keypad.skin/defaultbuttons.conf
+%%DATADIR%%/Trolltech-Touchscreen.skin/Trolltech-Touchscreen-down.png
+%%DATADIR%%/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.png
+%%DATADIR%%/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.skin
+%%DATADIR%%/Trolltech-Touchscreen.skin/defaultbuttons.conf
+%%DATADIR%%/pda.qrc
+%%DATADIR%%/pda.skin
+%%DATADIR%%/pda_down.png
+%%DATADIR%%/pda_up.png
+@dirrm %%DATADIR%%/Trolltech-Touchscreen.skin
+@dirrm %%DATADIR%%/Trolltech-Keypad.skin
+@dirrm %%DATADIR%%/TouchscreenPhone.skin
+@dirrm %%DATADIR%%/SmartPhoneWithButtons.skin
+@dirrm %%DATADIR%%/SmartPhone2.skin
+@dirrm %%DATADIR%%/SmartPhone.skin
+@dirrm %%DATADIR%%/PortableMedia.skin
+@dirrm %%DATADIR%%/PDAPhone.skin
+@dirrm %%DATADIR%%/DualScreenPhone.skin
+@dirrm %%DATADIR%%/ClamshellPhone.skin
+@dirrm %%DATADIR%%
diff --git a/devel/qt4-rcc/Makefile b/devel/qt4-rcc/Makefile
index 555bd5655b41..0a276bf52905 100644
--- a/devel/qt4-rcc/Makefile
+++ b/devel/qt4-rcc/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= rcc
-PORTVERSION= 4.2.3
+PORTVERSION= ${QT4_VERSION}
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -17,21 +17,13 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt resource compiler
-BUILD_DEPENDS= qmake-qt4:${PORTSDIR}/devel/qmake4
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/devel/qt4-rcc/distinfo b/devel/qt4-rcc/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/devel/qt4-rcc/distinfo
+++ b/devel/qt4-rcc/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/devel/qt4-script/Makefile b/devel/qt4-script/Makefile
new file mode 100644
index 000000000000..28f1e68bc5c2
--- /dev/null
+++ b/devel/qt4-script/Makefile
@@ -0,0 +1,68 @@
+# -*-mode: makefile-*-
+# New ports collection makefile for: qt40
+# Date created: Wed Jun 29 11:49:42 CEST 2005
+# Whom: lofi@freebsd.org
+#
+# $FreeBSD$
+#
+
+PORTNAME= script
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
+CATEGORIES?= devel
+MASTER_SITES= ${MASTER_SITE_QT}
+PKGNAMEPREFIX= qt4-
+DISTNAME= qt-x11-opensource-src-${PORTVERSION}
+DIST_SUBDIR= KDE
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Qt script
+
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc corelib
+QT_NONSTANDARD= yes
+QT_DIST= yes
+
+HAS_CONFIGURE= yes
+USE_LDCONFIG= yes
+
+ALL_TARGET= first
+CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
+MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
+ PATH=${WRKSRC}/bin:$$PATH
+EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
+ --exclude '${DISTNAME}/mkspecs' --exclude '${DISTNAME}/qmake' \
+ --exclude '${DISTNAME}/demos' --exclude '${DISTNAME}/examples' \
+ --exclude '${DISTNAME}/src/gui' --exclude '${DISTNAME}/src/network' \
+ --exclude '${DISTNAME}/src/opengl' --exclude '${DISTNAME}/src/qt3support' \
+ --exclude '${DISTNAME}/src/sql' --exclude '${DISTNAME}/src/xml' \
+ --exclude '${DISTNAME}/src/tools/moc' --exclude '${DISTNAME}/src/tools/rcc' \
+ --exclude '${DISTNAME}/src/tools/uic' --exclude '${DISTNAME}/src/tools/uic3' \
+ --exclude '${DISTNAME}/tools/assistant' --exclude '${DISTNAME}/tools/designer' \
+ --exclude '${DISTNAME}/tools/linguist' --exclude '${DISTNAME}/tools/porting' \
+ --exclude '${DISTNAME}/tools/qtconfig' --exclude '${DISTNAME}/tools/qvfb'
+WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME}
+CONFIGURE_WRKSRC=${WRKSRC}/../../
+PATCH_WRKSRC=${WRKSRC}/../../
+
+.include <bsd.port.pre.mk>
+
+pre-configure:
+ ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
+ ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \
+ -e 's|flat_headers.path.*|flat_headers.path=${PREFIX}/include/Qt|g' \
+ -e 's|targ_headers.path.*|targ_headers.path=${PREFIX}/include/$$$$TARGET|g' \
+ ${WRKSRC}/${PORTNAME}.pro ${WRKSRC}/../qt_install.pri
+ ${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/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+ -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${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/*Qt*
+
+.include <bsd.port.post.mk>
diff --git a/devel/qt4-script/distinfo b/devel/qt4-script/distinfo
new file mode 100644
index 000000000000..8fb631a2787d
--- /dev/null
+++ b/devel/qt4-script/distinfo
@@ -0,0 +1,3 @@
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/devel/qt4-script/pkg-descr b/devel/qt4-script/pkg-descr
new file mode 100644
index 000000000000..efc79b9aaf24
--- /dev/null
+++ b/devel/qt4-script/pkg-descr
@@ -0,0 +1,12 @@
+Qt is a C++ toolkit for application development. It lets application
+developers target all major operating systems with a single application
+source code.
+
+Qt provides a platform-independent API to all central platform functionality:
+GUI, database access, networking, file handling, etc. The Qt library
+encapsulates the different APIs of different operating systems, providing
+the application programmer with a single, common API for all operating systems.
+The native C APIs are encapsulated in a set of well-designed, fully
+object-oriented C++ classes.
+
+WWW: http://www.trolltech.com/products/qt/index.html
diff --git a/devel/qt4-script/pkg-plist b/devel/qt4-script/pkg-plist
new file mode 100644
index 000000000000..9b91d242407b
--- /dev/null
+++ b/devel/qt4-script/pkg-plist
@@ -0,0 +1,32 @@
+include/Qt/QtScript
+include/Qt/qscriptable.h
+include/Qt/qscriptcontext.h
+include/Qt/qscriptengine.h
+include/Qt/qscriptextensioninterface.h
+include/Qt/qscriptextensionplugin.h
+include/Qt/qscriptvalue.h
+include/Qt/qscriptvalueiterator.h
+include/QtScript/QScriptContext
+include/QtScript/QScriptEngine
+include/QtScript/QScriptExtensionInterface
+include/QtScript/QScriptExtensionPlugin
+include/QtScript/QScriptValue
+include/QtScript/QScriptValueIterator
+include/QtScript/QScriptValueList
+include/QtScript/QScriptable
+include/QtScript/QtScript
+include/QtScript/qscriptable.h
+include/QtScript/qscriptcontext.h
+include/QtScript/qscriptengine.h
+include/QtScript/qscriptextensioninterface.h
+include/QtScript/qscriptextensionplugin.h
+include/QtScript/qscriptvalue.h
+include/QtScript/qscriptvalueiterator.h
+lib/libQtScript.la
+lib/libQtScript.prl
+lib/libQtScript.so
+lib/libQtScript.so.4
+lib/libQtScript.so.4.3
+lib/libQtScript.so.4.3.0
+libdata/pkgconfig/QtScript.pc
+@dirrm include/QtScript
diff --git a/devel/qt4-uic/Makefile b/devel/qt4-uic/Makefile
index 7cb3777e061f..bbadecde2553 100644
--- a/devel/qt4-uic/Makefile
+++ b/devel/qt4-uic/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= uic
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,21 +18,13 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt user interface compiler
-BUILD_DEPENDS= qmake-qt4:${PORTSDIR}/devel/qmake4
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/devel/qt4-uic/distinfo b/devel/qt4-uic/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/devel/qt4-uic/distinfo
+++ b/devel/qt4-uic/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile
index 978a886f670e..b83d0c891af6 100644
--- a/devel/qt4-uic3/Makefile
+++ b/devel/qt4-uic3/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= uic3
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,27 +18,13 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt backwards-compatible user interface compiler
-BUILD_DEPENDS= qmake-qt4:${PORTSDIR}/devel/qmake4
-LIB_DEPENDS= Qt3Support:${PORTSDIR}/devel/qt4-qt3support \
- QtCore:${PORTSDIR}/devel/qt4-corelib \
- QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
- QtNetwork:${PORTSDIR}/net/qt4-network \
- QtSql:${PORTSDIR}/databases/qt4-sql \
- QtXml:${PORTSDIR}/textproc/qt4-xml
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake qt3support corelib gui network sql xml
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/devel/qt4-uic3/distinfo b/devel/qt4-uic3/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/devel/qt4-uic3/distinfo
+++ b/devel/qt4-uic3/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/devel/qt4/Makefile b/devel/qt4/Makefile
index c8e06ce49474..99a41fee6c5f 100644
--- a/devel/qt4/Makefile
+++ b/devel/qt4/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= qt4
-PORTVERSION= 4.2.3
-PORTREVISION= 2
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES= devel
MASTER_SITES= # empty
DISTFILES= # none
@@ -23,17 +23,20 @@ RUN_DEPENDS= ${LOCALBASE}/lib/plugins/accessible/libqtaccessiblecompatwidgets.so
${LOCALBASE}/lib/plugins/codecs/libqtwcodecs.so:${PORTSDIR}/chinese/qt4-codecs-tw \
${LOCALBASE}/lib/libQtSql.so:${PORTSDIR}/databases/qt4-sql \
qdbus:${PORTSDIR}/devel/dbus-qt4 \
+ qdbusviewer:${PORTSDIR}/devel/qt4-qdbusviewer \
qmake-qt4:${PORTSDIR}/devel/qmake4 \
assistant-qt4:${PORTSDIR}/devel/qt4-assistant \
${LOCALBASE}/lib/libQtCore.so:${PORTSDIR}/devel/qt4-corelib \
designer-qt4:${PORTSDIR}/devel/qt4-designer \
${LOCALBASE}/lib/libQtAssistantClient.so:${PORTSDIR}/devel/qt4-libqtassistantclient \
linguist-qt4:${PORTSDIR}/devel/qt4-linguist \
+ makeqpf-qt4:${PORTSDIR}/devel/qt4-makeqpf \
moc-qt4:${PORTSDIR}/devel/qt4-moc \
qt3to4:${PORTSDIR}/devel/qt4-porting \
${LOCALBASE}/lib/libQt3Support.so:${PORTSDIR}/devel/qt4-qt3support \
rcc:${PORTSDIR}/devel/qt4-rcc \
qvfb-qt4:${PORTSDIR}/devel/qt4-qvfb \
+ ${LOCALBASE}/lib/libQtScript.so:${PORTSDIR}/devel/qt4-script \
uic-qt4:${PORTSDIR}/devel/qt4-uic \
uic3:${PORTSDIR}/devel/qt4-uic3 \
${LOCALBASE}/lib/libQtTest.so:${PORTSDIR}/devel/qt4-qtestlib \
@@ -52,6 +55,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/plugins/accessible/libqtaccessiblecompatwidgets.so
NO_BUILD= yes
+.include "${.CURDIR}/../../Mk/bsd.qt.mk"
.include <bsd.port.pre.mk>
.if defined(WITH_SQL_PLUGINS)
diff --git a/devel/qt4/files/configure b/devel/qt4/files/configure
index 34921f55b6f0..702882753b01 100644
--- a/devel/qt4/files/configure
+++ b/devel/qt4/files/configure
@@ -20,6 +20,14 @@ 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"`
@@ -27,11 +35,11 @@ OPT_CMDLINE=`echo $@ | sed "s,-v ,,g; s,-v$,,g"`
QMAKE_SWITCHES=
QMAKE_VARS=
QMAKE_CONFIG=
+QTCONFIG_CONFIG=
QT_CONFIG=
-
SUPPORTED=
-
QMAKE_VARS_FILE=.qmake.vars
+
exec 5> "$QMAKE_VARS_FILE"
#-------------------------------------------------------------------------------
@@ -176,6 +184,20 @@ elif [ -f "$relpath"/LICENSE.PREVIEW.COMMERCIAL ]; then
Licensee="Preview"
Edition="Preview"
QT_EDITION="QT_EDITION_DESKTOP"
+elif [ -f "$relpath"/LICENSE.SNAPSHOT.COMMERCIAL ]; then
+ # snapshot - commercial
+ [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
+ [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes
+ Licensee="Snapshot"
+ Edition="Snapshot"
+ QT_EDITION="QT_EDITION_DESKTOP"
+elif [ -f "$relpath"/LICENSE.SNAPSHOT.OPENSOURCE ]; then
+ # snapshot - opensource
+ [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
+ [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes
+ Licensee="Snapshot"
+ Edition="Snapshot"
+ QT_EDITION="QT_EDITION_OPENSOURCE"
elif [ -f "$relpath"/LICENSE.TROLL ]; then
# internal Trolltech edition
[ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
@@ -187,15 +209,9 @@ else
[ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
[ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes
- # fix license file to quote the right side
- newlicense=`cat "$HOME"/.qt-license | sed -e 's/=\([^\"]\)/=\"\1/g' -e 's/\([^\"]\)$/\1\"/g' `
- cat > "$HOME"/.qt-license-temp <<EOF
-$newlicense
-EOF
-
# read in the license file
- if [ -f "$HOME"/.qt-license ]; then
- . "$HOME"/.qt-license >/dev/null 2>&1
+ if [ -f "$LICENSE_FILE" ]; then
+ . "$LICENSE_FILE" >/dev/null 2>&1
if [ -z "$LicenseKeyExt" ]; then
echo
echo "You are using an old license file."
@@ -439,16 +455,19 @@ for varname in $SYSTEM_VARIABLES; do
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"
+QMakeVar add mouse-drivers "pc linuxtp"
if [ "$Edition" = "Trolltech" ]; then
QMakeVar add kbd-drivers "um"
- QMakeVar add mouse-drivers "linuxtp" # adjust below as well
fi
# QTDIR may be set and point to an old or system-wide Qt installation
@@ -465,6 +484,7 @@ CFG_INCREMENTAL=auto
CFG_QCONFIG=full
CFG_EMBEDDED=no
CFG_DEBUG=auto
+CFG_MYSQL_CONFIG=
CFG_DEBUG_RELEASE=no
CFG_SHARED=yes
CFG_SM=auto
@@ -472,7 +492,9 @@ CFG_XSHAPE=auto
CFG_XINERAMA=auto
CFG_ZLIB=auto
CFG_SQLITE=qt
-CFG_GIF=no
+CFG_GIF=auto
+CFG_TIFF=auto
+CFG_LIBTIFF=auto
CFG_PNG=yes
CFG_LIBPNG=auto
CFG_JPEG=auto
@@ -483,16 +505,18 @@ CFG_XCURSOR=auto
CFG_XRANDR=auto
CFG_XRENDER=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"
+QT_DEFAULT_BUILD_PARTS="libs tools examples demos"
CFG_BUILD_PARTS=""
CFG_NOBUILD_PARTS=""
+CFG_RELEASE_QMAKE=no
-CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc"
-CFG_GFX_ON="linuxfb"
+CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen"
+CFG_GFX_ON="linuxfb multiscreen"
CFG_GFX_PLUGIN_AVAILABLE=
CFG_GFX_PLUGIN=
CFG_GFX_OFF=
@@ -524,10 +548,16 @@ CFG_ICONV=auto
CFG_QDBUS=auto
CFG_GLIB=auto
CFG_LARGEFILE=auto
+CFG_OPENSSL=auto
CFG_STL=auto
-CFG_PRECOMPILE=no
+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=prompted
@@ -536,14 +566,18 @@ CFG_ACCESSIBILITY=auto
CFG_QT3SUPPORT=yes
CFG_ENDIAN=auto
CFG_DOUBLEFORMAT=auto
+CFG_ARMFPA=auto
CFG_IWMMXT=no
+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_UNIVERSAL_BINARY=auto
+CFG_MAC_ARCHS=
+CFG_MAC_DWARF2=no
CFG_SXE=no
CFG_PREFIX_INSTALL=yes
CFG_SDK=
@@ -601,30 +635,46 @@ CFG_SQL_tds=no
CFG_SQL_oci=no
CFG_SQL_db2=no
-CFG_SQL_AVAILABLE=`find "$relpath"/src/plugins/sqldrivers/* -prune -type d -exec basename {} \;`
-CFG_SQL_AVAILABLE=`echo $CFG_SQL_AVAILABLE` # normalize whitespace
-# by default, auto-detect which sql drivers can be built
-for i in $CFG_SQL_AVAILABLE; do
- eval "CFG_SQL_$i=auto"
-done
+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=""
+CFG_DECORATION_PLUGIN_AVAILABLE=
if [ -d "$relpath/src/plugins/decorations" ]; then
- CFG_DECORATION_PLUGIN_AVAILABLE=`find "$relpath"/src/plugins/decorations/* -prune -type d -exec basename {} \;`
- CFG_DECORATION_PLUGIN_AVAILABLE=`echo $CFG_DECORATION_PLUGIN_AVAILABLE` # normalize whitespace
+ 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_MOUSE_PLUGIN_AVAILABLE=""
+CFG_MOUSE_PLUGIN_AVAILABLE=
if [ -d "$relpath/src/plugins/mousedrivers" ]; then
- CFG_MOUSE_PLUGIN_AVAILABLE=`find "$relpath"/src/plugins/mousedrivers/* -prune -type d -exec basename {} \;`
- CFG_MOUSE_PLUGIN_AVAILABLE=`echo $CFG_MOUSE_PLUGIN_AVAILABLE` # normalize whitespace
+ 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=""
+CFG_GFX_PLUGIN_AVAILABLE=
if [ -d "$relpath/src/plugins/gfxdrivers" ]; then
- CFG_GFX_PLUGIN_AVAILABLE=`find "$relpath"/src/plugins/gfxdrivers/* -prune -type d -exec basename {} \;`
- CFG_GFX_PLUGIN_AVAILABLE=`echo $CFG_GFX_PLUGIN_AVAILABLE` # normalize whitespace
- CFG_GFX_OFF="$CFG_GFX_AVAILABLE" # assume all off
+ 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
#-------------------------------------------------------------------------------
@@ -668,7 +718,7 @@ while [ "$#" -gt 0 ]; do
VAL=no
;;
#Qt style yes options
- -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-tablet|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-fontconfig|-xkb|-nis|-qdbus|-glib|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-opengl|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-universal|-prefix-install|-silent)
+ -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-tablet|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-fontconfig|-xkb|-nis|-qdbus|-glib|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-opengl|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl)
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
VAL=yes
;;
@@ -683,7 +733,7 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_ARG=yes
fi
;;
- -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk)
+ -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-mysql_config)
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
shift
VAL="$1"
@@ -811,9 +861,15 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
+ license)
+ LICENSE_FILE="$VAL"
+ ;;
gnumake)
CFG_USE_GNUMAKE="$VAL"
;;
+ mysql_config)
+ CFG_MYSQL_CONFIG="$VAL"
+ ;;
prefix)
QT_INSTALL_PREFIX="$VAL"
;;
@@ -869,6 +925,13 @@ while [ "$#" -gt 0 ]; do
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"
@@ -878,6 +941,13 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
+ armfpa)
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+ CFG_ARMFPA="$VAL"
+ else
+ UNKNOWN_OPT=yes
+ fi
+ ;;
depths)
CFG_QWS_DEPTHS="$VAL"
;;
@@ -927,9 +997,23 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
- universal)
+ dwarf2)
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+ CFG_MAC_DWARF2="$VAL"
+ else
+ UNKNOWN_OPT=yes
+ fi
+ ;;
+ arch)
if [ "$PLATFORM_MAC" = "yes" ]; then
- CFG_UNIVERSAL_BINARY="$VAL"
+ CFG_MAC_ARCHS="$CFG_MAC_ARCHS $VAL"
+ else
+ UNKNOWN_OPT=yes
+ fi
+ ;;
+ universal)
+ if [ "$PLATFORM_MAC" = "yes" ] && [ "$VAL" = "yes" ]; then
+ CFG_MAC_ARCHS="$CFG_MAC_ARCHS x86 ppc"
else
UNKNOWN_OPT=yes
fi
@@ -1007,6 +1091,19 @@ while [ "$#" -gt 0 ]; do
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)
@@ -1019,6 +1116,13 @@ while [ "$#" -gt 0 ]; do
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
@@ -1147,6 +1251,41 @@ while [ "$#" -gt 0 ]; do
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
+ ;;
+ 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
@@ -1195,6 +1334,14 @@ while [ "$#" -gt 0 ]; do
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"
@@ -1286,6 +1433,13 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
+ openssl)
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+ CFG_OPENSSL="$VAL"
+ else
+ UNKNOWN_OPT=yes
+ fi
+ ;;
confirm-license)
if [ "$VAL" = "yes" ]; then
OPT_CONFIRM_LICENSE="$VAL"
@@ -1485,6 +1639,7 @@ fi
# where to find which..
unixtests="$relpath/config.tests/unix"
+mactests="$relpath/config.tests/mac"
WHICH="$unixtests/which.test"
# find out which awk we want to use, prefer gawk, then nawk, then regular awk
@@ -2078,36 +2233,41 @@ else
CFG_FRAMEWORK=no
fi
-# find the default universal value
-if [ "$PLATFORM_MAC" = "yes" ]; then
- if [ "$CFG_UNIVERSAL_BINARY" = "auto" ]; then
- CFG_UNIVERSAL_BINARY="no" #any other default? ###
- fi
-else
- CFG_UNIVERSAL_BINARY="no"
-fi
-
-TEST_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CC[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1,"`
+TEST_COMPILER="$CC"
+[ -z "$TEST_COMPILE" ] && TEST_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1,"`
# auto-detect precompiled header support
if [ "$CFG_PRECOMPILE" = "auto" ]; then
- if [ "$CFG_UNIVERSAL_BINARY" = "yes" ]; 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" ] && [ "$CFG_UNIVERSAL_BINARY" = "yes" ]; then
+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" != "no" ]; then
+ if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then
+ CFG_MAC_DWARF2=no
+ else
+ CFG_MAC_DWARF2=yes
+ fi
+fi
+
# auto-detect support for separate debug info in objcopy
-if [ "$CFG_SEPARATE_DEBUG_INFO" = "auto" ] && [ "$CFG_SHARED" = "yes" ]; then
- COMPILER_WITH_FLAGS="$TEST_COMPILER `getQMakeConf | sed -n -e 's/QMAKE_CFLAGS[^_].*=//p'`"
+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_CXX_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s%.* *= *\(.*\)$%\1%" | tr '\n' ' '`
+ COMPILER_WITH_FLAGS="$TEST_CXX_COMPILER $TEST_COMPILER_CXXFLAGS"
+ COMPILER_WITH_FLAGS=`echo "$COMPILER_WITH_FLAGS" | sed -e "s%\\$\\$QMAKE_CFLAGS%$TEST_COMPILER_CFLAGS%"`
if "$unixtests/objcopy.test" "$COMPILER_WITH_FLAGS" "$OPT_VERBOSE"; then
CFG_SEPARATE_DEBUG_INFO=no
else
@@ -2132,28 +2292,21 @@ if [ "$CFG_REDUCE_EXPORTS" = "auto" ]; then
fi
fi
-# detect sse support
-if "$unixtests/sse.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then
- CFG_HAVE_SSE=no
-else
- CFG_HAVE_SSE=yes
-fi
-
-# check iwmmxt support
-if [ "$CFG_IWMMXT" = "yes" ]; then
- if ! "$unixtests/iwmmxt.test" "$XQMAKESPEC" "$OPT_VERBOSE"; then
- echo "The iwmmxt functionality test failed!"
- echo " Please make sure your compiler supports iwmmxt intrinsics!"
- exit 1
+# 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
+# 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
-#mac
+# mac
if [ "$PLATFORM_MAC" = "yes" ]; then
if [ "$CFG_OPENGL" = "auto" ]; then
CFG_OPENGL=yes
@@ -2174,16 +2327,7 @@ else
CFG_FRAMEWORK=no
fi
-# find the default universal value
-if [ "$PLATFORM_MAC" = "yes" ]; then
- if [ "$CFG_UNIVERSAL_BINARY" = "auto" ]; then
- CFG_UNIVERSAL_BINARY="no" #any other default? ###
- fi
-else
- CFG_UNIVERSAL_BINARY="no"
-fi
-
-#x11 tests are done after qmake is built
+# x11 tests are done after qmake is built
# embedded
if [ "$PLATFORM_QWS" = "yes" ]; then
@@ -2404,19 +2548,20 @@ if [ "$OPT_HELP" = "yes" ]; then
Usage: $relconf [-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]
+ [-demosdir <dir>] [-buildkey <key>] [-release] [-debug]
[-debug-and-release] [-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] [-no-zlib]
- [-qt-zlib] [-system-zlib] [-no-gif] [-qt-gif] [-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]
+ [-qt-zlib] [-system-zlib] [-no-gif] [-qt-gif] [-no-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-qdbus] [-qdbus] [-no-separate-debug-info]
- [-separate-debug-info]
+ [-no-mmx] [-no-3dnow] [-no-sse] [-no-sse2]
+ [-separate-debug-info] [-armfpa] [-no-optimized-qmake] [-optimized-qmake]
[additional platform specific options (see below)]
@@ -2533,6 +2678,11 @@ fi
See the README file for a list of supported
operating systems and compilers.
+ -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.
+
-D <string> ........ Add an explicit define to the preprocessor.
-I <string> ........ Add an explicit include path.
-L <string> ........ Add an explicit library path.
@@ -2550,6 +2700,11 @@ Third Party Libraries:
-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.
@@ -2565,6 +2720,9 @@ Third Party Libraries:
+ -system-libjpeg .... Use libjpeg from the operating system.
See http://www.ijg.org
+ -no-openssl ........ Do not compile support for OpenSSL.
+ + -openssl ........... Use OpenSSL from the operating system.
+
Additional options:
-make <part> ....... Add part to the list of parts to be built at make time.
@@ -2589,6 +2747,9 @@ Additional options:
-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.
@@ -2604,8 +2765,9 @@ Additional options:
$DBN -no-qdbus........... Do not compile the QtDBus module.
$DBY -qdbus.............. Compile the QtDBus module.
- $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
+ -reduce-relocations ... Reduce relocations in the libraries through extra linker
+ optimizations (Qt/X11 / Qtopia/Core only;
+ experimental; needs GNU ld >= 2.18)
EOF
@@ -2741,6 +2903,9 @@ Qt/X11 only:
$GBN -no-glib............ Do not compile Glib support.
$GBY -glib............... Compile Glib support.
+ $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
@@ -2756,9 +2921,13 @@ Qt/Mac only:
link tools against those frameworks.
-no-framework ...... Do not build Qt as a series of frameworks.
- -universal ......... Build Qt as a universal binary to work on intel
- as well as PPC platforms.
- * -no-universal ...... Build Qt and its tools to work only on this host platform.
+ -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
-sdk <sdk>.......... Build Qt using Apple provided SDK <sdk>.
@@ -2780,6 +2949,12 @@ Qtopia Core only:
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).
@@ -2959,6 +3134,41 @@ elif [ "$Edition" = "Preview" ]; then
fi
fi
done
+elif [ "$Edition" = "Snapshot" ]; then
+ 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 Qt SNAPSHOT VERSION LICENSE AGREEMENT"
+ echo
+ echo "Type '?' to read the Snapshot 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
+ if [ "$QT_EDITION" = "QT_EDITION_OPENSOURCE" ]; then
+ more "$relpath/LICENSE.SNAPSHOT.OPENSOURCE"
+ else
+ more "$relpath/LICENSE.SNAPSHOT.COMMERCIAL"
+ fi
+ fi
+ done
elif [ "$Edition" != "Trolltech" ]; then
if [ -n "$ExpiryDate" ]; then
ExpiryDate=`echo $ExpiryDate | sed -e "s,-,,g" | tr -d "\n\r"`
@@ -3150,7 +3360,7 @@ fi
# is where the resulting variable is written to
setBootstrapVariable()
{
- variableRegExp="$1[^_A-Z0-9]"
+ variableRegExp="^$1[^_A-Z0-9]"
getQMakeConf | grep "$variableRegExp" | ( [ -n "$2" ] && sed "$2" ; [ -z "$2" ] && cat ) | $AWK '
{
varLength = index($0, "=") - 1
@@ -3169,7 +3379,7 @@ END {
printf "%s =", var
for (i = 1; i <= NR; ++i)
printf " $(%s_%s)", var, i
- printf "\n"
+ printf "\n"
}
}' >> "$mkfile"
}
@@ -3232,13 +3442,19 @@ if false; then ###[ '!' -f "$outpath/bin/qmake" ];
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
- setBootstrapVariable QMAKE_CC 's,QMAKE_CC.*=,CC=\@,'
- setBootstrapVariable QMAKE_CXX 's,QMAKE_CXX.*=,CXX=\@,'
+ [ -z "$CC" ] && setBootstrapVariable QMAKE_CC 's,QMAKE_CC.*=,CC=\@,'
+ [ -z "$CXX" ] && setBootstrapVariable QMAKE_CXX 's,QMAKE_CXX.*=,CXX=\@,'
else
- setBootstrapVariable QMAKE_CC 's,QMAKE_CC,CC,'
- setBootstrapVariable QMAKE_CXX 's,QMAKE_CXX,CXX,'
+ [ -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),'
@@ -3250,12 +3466,18 @@ if false; then ###[ '!' -f "$outpath/bin/qmake" ];
else
echo "include Makefile.commercial" >>"$mkfile"
fi
- if [ "$CFG_DEBUG" = "yes" ]; then
+ 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
@@ -3263,21 +3485,26 @@ if false; then ###[ '!' -f "$outpath/bin/qmake" ];
done
fi
if [ "$PLATFORM_MAC" = "yes" ]; then
- echo "export MACOSX_DEPLOYMENT_TARGET = 10.2" >>"$mkfile"
+ echo "export MACOSX_DEPLOYMENT_TARGET = 10.3" >>"$mkfile"
echo "CARBON_LFLAGS =-framework CoreServices -framework CoreFoundation" >>"$mkfile"
EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)"
EXTRA_CFLAGS="$EXTRA_CFLAGS \$(CARBON_CFLAGS)"
EXTRA_CXXFLAGS="$EXTRA_CFLAGS \$(CARBON_CXXFLAGS)"
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 [ "$CFG_UNIVERSAL_BINARY" = "yes" ]; then
+ if echo "$CFG_MAC_ARCHS" | grep x86 > /dev/null 2>&1; then
X86_CFLAGS=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CFLAGS_X86[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1,"`
X86_LFLAGS=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_LFLAGS_X86[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1,"`
+ EXTRA_CFLAGS="$X86_CFLAGS $EXTRA_CFLAGS"
+ EXTRA_CXXFLAGS="$X86_CFLAGS $EXTRA_CXXFLAGS"
+ EXTRA_LFLAGS="$EXTRA_LFLAGS $X86_LFLAGS"
+ fi
+ if echo "$CFG_MAC_ARCHS" | grep ppc > /dev/null 2>&1; then
PPC_CFLAGS=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CFLAGS_PPC[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1,"`
PPC_LFLAGS=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_LFLAGS_PPC[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1,"`
- EXTRA_CFLAGS="$X86_CFLAGS $PPC_CFLAGS $EXTRA_CFLAGS"
- EXTRA_CXXFLAGS="$X86_CFLAGS $PPC_CFLAGS $EXTRA_CXXFLAGS"
- EXTRA_LFLAGS="$EXTRA_LFLAGS $X86_LFLAGS $PPC_LFLAGS"
+ 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"
@@ -3326,9 +3553,61 @@ 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" = "auto" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/zlib "zlib" $L_FLAGS $I_FLAGS $l_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/zlib "zlib" $L_FLAGS $I_FLAGS $l_FLAGS; then
CFG_ZLIB=system
else
CFG_ZLIB=yes
@@ -3345,13 +3624,40 @@ if [ "$CFG_JPEG" = "auto" ]; then
fi
# detect jpeg
if [ "$CFG_LIBJPEG" = "auto" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libjpeg "libjpeg" $L_FLAGS $I_FLAGS $l_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libjpeg "libjpeg" $L_FLAGS $I_FLAGS $l_FLAGS; 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; 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
@@ -3362,7 +3668,7 @@ if [ "$CFG_MNG" = "auto" ]; then
fi
# detect mng
if [ "$CFG_LIBMNG" = "auto" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libmng "libmng" $L_FLAGS $I_FLAGS $l_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libmng "libmng" $L_FLAGS $I_FLAGS $l_FLAGS; then
CFG_LIBMNG=system
else
CFG_LIBMNG=qt
@@ -3371,7 +3677,7 @@ fi
# detect png
if [ "$CFG_LIBPNG" = "auto" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS; then
CFG_LIBPNG=system
else
CFG_LIBPNG=qt
@@ -3388,15 +3694,17 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
case $_SQLDR in
mysql)
if [ "$CFG_SQL_mysql" != "no" ]; then
- if "$WHICH" mysql_config >/dev/null 2>&1; then
- QT_CFLAGS_MYSQL=`mysql_config --include 2>/dev/null`
- QT_LFLAGS_MYSQL_R=`mysql_config --libs_r 2>/dev/null`
- QT_LFLAGS_MYSQL=`mysql_config --libs 2>/dev/null`
- QT_MYSQL_VERSION=`mysql_config --version | cut -d . -f 1`
+ [ -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" -lt 4 ]; then
+ 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 (`mysql_config --version`)."
+ 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."
@@ -3408,13 +3716,13 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
QT_CFLAGS_MYSQL=""
fi
else
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mysql_r "MySQL (thread-safe)" $QT_LFLAGS_MYSQL_R $L_FLAGS $QT_CFLAGS_MYSQL $I_FLAGS $l_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mysql_r "MySQL (thread-safe)" $QT_LFLAGS_MYSQL_R $L_FLAGS $QT_CFLAGS_MYSQL $I_FLAGS $l_FLAGS; 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" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mysql "MySQL (thread-unsafe)" $QT_LFLAGS_MYSQL $L_FLAGS $QT_CFLAGS_MYSQL $I_FLAGS $l_FLAGS; then
+ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mysql "MySQL (thread-unsafe)" $QT_LFLAGS_MYSQL $L_FLAGS $QT_CFLAGS_MYSQL $I_FLAGS $l_FLAGS; then
if [ "$CFG_SQL_mysql" = "auto" ]; then
CFG_SQL_mysql=plugin
fi
@@ -3443,7 +3751,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
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 $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS; then
if [ "$CFG_SQL_psql" = "auto" ]; then
CFG_SQL_psql=plugin
fi
@@ -3464,7 +3772,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
;;
odbc)
if [ "$CFG_SQL_odbc" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS; then
if [ "$CFG_SQL_odbc" = "auto" ]; then
CFG_SQL_odbc=plugin
fi
@@ -3483,7 +3791,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
;;
oci)
if [ "$CFG_SQL_oci" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/oci "OCI" $L_FLAGS $I_FLAGS $l_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/oci "OCI" $L_FLAGS $I_FLAGS $l_FLAGS; then
if [ "$CFG_SQL_oci" = "auto" ]; then
CFG_SQL_oci=plugin
fi
@@ -3502,7 +3810,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
;;
tds)
if [ "$CFG_SQL_tds" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS; then
if [ "$CFG_SQL_tds" = "auto" ]; then
CFG_SQL_tds=plugin
fi
@@ -3521,7 +3829,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
;;
db2)
if [ "$CFG_SQL_db2" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/db2 "DB2" $L_FLAGS $I_FLAGS $l_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/db2 "DB2" $L_FLAGS $I_FLAGS $l_FLAGS; then
if [ "$CFG_SQL_db2" = "auto" ]; then
CFG_SQL_db2=plugin
fi
@@ -3540,7 +3848,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
;;
ibase)
if [ "$CFG_SQL_ibase" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ibase "InterBase" $L_FLAGS $I_FLAGS $l_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ibase "InterBase" $L_FLAGS $I_FLAGS $l_FLAGS; then
if [ "$CFG_SQL_ibase" = "auto" ]; then
CFG_SQL_ibase=plugin
fi
@@ -3559,7 +3867,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
;;
sqlite2)
if [ "$CFG_SQL_sqlite2" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite2 "SQLite2" $L_FLAGS $I_FLAGS $l_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite2 "SQLite2" $L_FLAGS $I_FLAGS $l_FLAGS; then
if [ "$CFG_SQL_sqlite2" = "auto" ]; then
CFG_SQL_sqlite2=plugin
fi
@@ -3584,11 +3892,11 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
QT_CFLAGS_SQLITE=`pkg-config --cflags sqlite3`
QT_LFLAGS_SQLITE=`pkg-config --libs sqlite3`
fi
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS; then
if [ "$CFG_SQL_sqlite" = "auto" ]; then
CFG_SQL_sqlite=plugin
- QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite"
fi
+ QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite"
else
SQLITE_AUTODETECT_FAILED="yes"
CFG_SQL_sqlite=no
@@ -3621,7 +3929,7 @@ done
# auto-detect NIS support
if [ "$CFG_NIS" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/nis "NIS" $L_FLAGS $I_FLAGS $l_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/nis "NIS" $L_FLAGS $I_FLAGS $l_FLAGS; then
CFG_NIS=yes
else
if [ "$CFG_NIS" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
@@ -3638,7 +3946,7 @@ fi
# auto-detect CUPS support
if [ "$CFG_CUPS" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/cups "Cups" $L_FLAGS $I_FLAGS $l_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/cups "Cups" $L_FLAGS $I_FLAGS $l_FLAGS; then
CFG_CUPS=yes
else
if [ "$CFG_CUPS" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
@@ -3657,9 +3965,9 @@ fi
if [ "$CFG_ICONV" != "no" ]; then
if [ "$PLATFORM_QWS" = "yes" ]; then
CFG_ICONV=no
- elif "$unixtests/compile.test" "$XQMAKESPEC" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" "$L_FLAGS" "$I_FLAGS" "$l_FLAGS"; then
+ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" "$L_FLAGS" "$I_FLAGS" "$l_FLAGS"; then
CFG_ICONV=yes
- elif "$unixtests/compile.test" "$XQMAKESPEC" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/gnu-libiconv" "GNU libiconv" "$L_FLAGS" "$I_FLAGS" "$l_FLAGS"; then
+ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/gnu-libiconv" "GNU libiconv" "$L_FLAGS" "$I_FLAGS" "$l_FLAGS"; then
CFG_ICONV=gnu
else
if [ "$CFG_ICONV" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
@@ -3681,7 +3989,7 @@ if [ "$CFG_QDBUS" != "no" ]; then
QT_CFLAGS_DBUS=`pkg-config --cflags dbus-1`
QT_LIBS_DBUS=`pkg-config --libs dbus-1`
fi
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/dbus "dbus" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_DBUS $QT_LIBS_DBUS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/dbus "D-Bus" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_DBUS $QT_LIBS_DBUS; then
CFG_QDBUS=yes
QMakeVar set QT_CFLAGS_DBUS "$QT_CFLAGS_DBUS"
QMakeVar set QT_LIBS_DBUS "$QT_LIBS_DBUS"
@@ -3713,7 +4021,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then
# auto-detect OpenGL support
if [ "$CFG_OPENGL" = "auto" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
CFG_OPENGL=yes
else
CFG_OPENGL=no
@@ -3722,7 +4030,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then
# auto-detect Xcursor support
if [ "$CFG_XCURSOR" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xcursor "Xcursor" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; 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
CFG_XCURSOR=yes
else
if [ "$CFG_XCURSOR" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
@@ -3739,7 +4047,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then
# auto-detect Xfixes support
if [ "$CFG_XFIXES" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xfixes "Xfixes" $L_FLAGS $I_FLAGS $X11TESTS_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xfixes "Xfixes" $L_FLAGS $I_FLAGS $X11TESTS_FLAGS; then
CFG_XFIXES=yes
else
if [ "$CFG_XFIXES" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
@@ -3756,7 +4064,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then
# auto-detect Xrandr support (resize and rotate extension)
if [ "$CFG_XRANDR" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xrandr "Xrandr" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; 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
CFG_XRANDR=yes
else
if [ "$CFG_XRANDR" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
@@ -3773,7 +4081,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then
# auto-detect Xrender support
if [ "$CFG_XRENDER" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xrender "Xrender" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; 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
@@ -3790,7 +4098,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then
# auto-detect FontConfig support
if [ "$CFG_FONTCONFIG" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/fontconfig "FontConfig" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/fontconfig "FontConfig" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
CFG_FONTCONFIG=yes
QMakeVar set QMAKE_LIBS_X11 '-lfreetype -lfontconfig $$QMAKE_LIBS_X11'
CFG_LIBFREETYPE=system
@@ -3809,7 +4117,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then
# auto-detect Session Management support
if [ "$CFG_SM" = "auto" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/sm "Session Management" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; 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
@@ -3826,7 +4134,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then
# auto-detect SHAPE support
if [ "$CFG_XSHAPE" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xshape "XShape" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; 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
@@ -3843,7 +4151,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then
# auto-detect Xinerama support
if [ "$CFG_XINERAMA" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xinerama "Xinerama" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; 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
CFG_XINERAMA=yes
else
if [ "$CFG_XINERAMA" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
@@ -3860,7 +4168,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then
# auto-detect tablet support (currenlty only in IRIX)
if [ "$CFG_TABLET" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xinput "Tablet (XInput)" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xinput "Tablet (XInput)" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
CFG_TABLET=yes
else
if [ "$CFG_TABLET" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
@@ -3877,7 +4185,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then
# auto-detect XKB support
if [ "$CFG_XKB" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xkb "XKB" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; 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
@@ -3898,7 +4206,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then
QT_CFLAGS_GLIB=`pkg-config --cflags glib-2.0 gthread-2.0`
QT_LIBS_GLIB=`pkg-config --libs glib-2.0 gthread-2.0`
fi
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/glib "Glib" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_GLIB $QT_LIBS_GLIB $X11TESTS_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/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"
@@ -3919,10 +4227,22 @@ fi # X11
# QWS
if [ "$PLATFORM_QWS" = "yes" ]; then
+ # OpenGL ES
+ if [ "$CFG_OPENGL" = "yes" ]; then
+ if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/opengles "OpenGL ES" $L_FLAGS $I_FLAGS $l_FLAGS; then
+ echo "The OpenGL ES functionality test failed!"
+ 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
+
+ fi
+
# 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" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tslib "tslib" $L_FLAGS $I_FLAGS $l_FLAGS; 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 add additional include and library search paths"
echo " by passing the -I and -L switches to $0."
@@ -3937,14 +4257,13 @@ fi # QWS
[ "x$CFG_EMBEDDED" != "xno" ] && CFG_LIBFREETYPE="$CFG_QWS_FREETYPE"
[ "x$PLATFORM_MAC" = "xyes" ] && CFG_LIBFREETYPE=no
if [ "$CFG_LIBFREETYPE" = "auto" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/freetype "FreeType" $L_FLAGS $I_FLAGS $l_FLAGS ; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/freetype "FreeType" $L_FLAGS $I_FLAGS $l_FLAGS ; then
CFG_LIBFREETYPE=system
else
CFG_LIBFREETYPE=yes
fi
fi
-
if [ "$CFG_ENDIAN" = "auto" ]; then
if [ "$PLATFORM_MAC" = "yes" ]; then
true #leave as auto
@@ -3966,6 +4285,19 @@ if [ "$CFG_ENDIAN" = "auto" ]; then
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
@@ -3982,8 +4314,10 @@ if [ "$CFG_DOUBLEFORMAT" = "auto" ]; 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."
@@ -3996,7 +4330,7 @@ if [ "$CFG_DOUBLEFORMAT" = "auto" ]; then
fi
fi
if [ "$CFG_STL" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then
CFG_STL=yes
else
if [ "$CFG_STL" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
@@ -4013,7 +4347,7 @@ fi
# find if the platform supports IPv6
if [ "$CFG_IPV6" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS; then
CFG_IPV6=yes
else
if [ "$CFG_IPV6" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
@@ -4028,9 +4362,27 @@ if [ "$CFG_IPV6" != "no" ]; then
fi
fi
+# detect POSIX monotonic clocks
+if [ "$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
+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" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/getaddrinfo "getaddrinfo" $L_FLAGS $I_FLAGS $l_FLAGS; 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
@@ -4047,7 +4399,7 @@ fi
# find if the platform provides inotify
if [ "$CFG_INOTIFY" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/inotify "inotify" $L_FLAGS $I_FLAGS $l_FLAGS; 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
@@ -4064,7 +4416,7 @@ fi
# find if the platform provides if_nametoindex (ipv6 interface name support)
if [ "$CFG_IPV6IFNAME" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6ifname "IPv6 interface name" $L_FLAGS $I_FLAGS $l_FLAGS; 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
@@ -4081,7 +4433,7 @@ fi
# find if the platform provides getifaddrs (network interface enumeration)
if [ "$CFG_GETIFADDRS" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/getifaddrs "getifaddrs" $L_FLAGS $I_FLAGS $l_FLAGS; 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
@@ -4098,7 +4450,7 @@ fi
# find if the platform supports X/Open Large File compilation environment
if [ "$CFG_LARGEFILE" != "no" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/largefile "X/Open Large File" $L_FLAGS $I_FLAGS $l_FLAGS; 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
@@ -4113,6 +4465,23 @@ if [ "$CFG_LARGEFILE" != "no" ]; then
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; then
+ CFG_OPENSSL=yes
+ else
+ if [ "$CFG_OPENSSL" = "yes" ] && [ "$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
+
#-------------------------------------------------------------------------------
# ask for all that hasn't been auto-detected or specified in the arguments
#-------------------------------------------------------------------------------
@@ -4122,6 +4491,7 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PLATFORM_QWS" = "yes" ]; then
echo
echo "Choose pixel-depths to support:"
echo
+ echo " 4. 4bpp grayscale"
echo " 8. 8bpp"
echo " 16. 16bpp"
echo " 18. 18bpp"
@@ -4142,6 +4512,11 @@ if [ -n "$CFG_QWS_DEPTHS" -a "$PLATFORM_QWS" = "yes" ]; then
done
fi
+# enable dwarf2 support on Mac
+if [ "$CFG_MAC_DWARF2" = "yes" ]; then
+ QT_CONFIG="$QT_CONFIG dwarf2"
+fi
+
# enable Qt 3 support functionality
if [ "$CFG_QT3SUPPORT" = "yes" ]; then
QT_CONFIG="$QT_CONFIG qt3support"
@@ -4158,6 +4533,13 @@ fi
if [ "$CFG_OPENGL" = "no" ]; then
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENGL"
else
+ if [ "$PLATFORM_QWS" = "yes" ]; then
+ QCONFIG_FLAGS="$QCONFIG_FLAGS Q_BACKINGSTORE_SUBSURFACES"
+ QCONFIG_FLAGS="$QCONFIG_FLAGS Q_USE_EGLWINDOWSURFACE"
+
+ # The examples and demos currently don't compile with OpenGL ES
+ CFG_NOBUILD_PARTS="$CFG_NOBUILD_PARTS examples demos"
+ fi
QT_CONFIG="$QT_CONFIG opengl"
fi
@@ -4204,6 +4586,7 @@ if [ "$PLATFORM_QWS" = "yes" ]; then
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"
@@ -4220,18 +4603,28 @@ 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_HAVE_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse"
+[ "$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"
-[ "$CFG_UNIVERSAL_BINARY" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG x86 ppc"
+[ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS"
if [ "$CFG_IPV6" = "yes" ]; then
QT_CONFIG="$QT_CONFIG ipv6"
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
@@ -4276,6 +4669,14 @@ if [ "$CFG_GIF" = "no" ]; then
elif [ "$CFG_GIF" = "yes" ]; then
QT_CONFIG="$QT_CONFIG gif"
fi
+if [ "$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
@@ -4305,6 +4706,7 @@ fi
[ "$CFG_GLIB" = "yes" ] && QT_CONFIG="$QT_CONFIG glib"
[ "$CFG_QDBUS" = "yes" ] && QT_CONFIG="$QT_CONFIG qdbus"
[ "$CFG_NAS" = "system" ] && QT_CONFIG="$QT_CONFIG nas"
+[ "$CFG_OPENSSL" = "yes" ] && QT_CONFIG="$QT_CONFIG openssl"
if [ "$PLATFORM_X11" = "yes" ]; then
[ "$CFG_SM" = "yes" ] && QT_CONFIG="$QT_CONFIG x11sm"
@@ -4471,6 +4873,7 @@ esac
# 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
@@ -4618,6 +5021,9 @@ if [ "$CFG_DOUBLEFORMAT" != "normal" ]; then
#define Q_DOUBLE_FORMAT $CFG_DOUBLEFORMAT
EOF
fi
+if [ "$CFG_ARMFPA" = "yes" ]; then
+ echo "#define QT_ARMFPA" >>"$outpath/src/corelib/global/qconfig.h.new"
+fi
echo '/* Machine Architecture */' >>"$outpath/src/corelib/global/qconfig.h.new"
ARCH_STR=`echo $ARCH | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
@@ -4634,8 +5040,20 @@ if [ "$CFG_FRAMEWORK" = "yes" ]; then
echo "#define QT_MAC_FRAMEWORK_BUILD" >>"$outpath/src/corelib/global/qconfig.h.new"
fi
-"$unixtests/ptrsize.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath"
-echo "#define QT_POINTER_SIZE $?" >>"$outpath/src/corelib/global/qconfig.h.new"
+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 [ "$Edition" = "Trolltech" ]; then
@@ -4661,6 +5079,10 @@ if [ "$PLATFORM_QWS" = "yes" ]; then
done
CFG_KBD_OFF="$CFG_KBD_AVAILABLE"
+ # the um driver is currently not in the available list for external builds
+ if [ "$Edition" != "Trolltech" ]; 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
@@ -4686,6 +5108,10 @@ if [ "$PLATFORM_QWS" = "yes" ]; then
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"
@@ -4706,6 +5132,7 @@ 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"
@@ -4720,12 +5147,16 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
[ "$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_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_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"
@@ -4801,8 +5232,8 @@ fi
#-------------------------------------------------------------------------------
QTCONFIG="$outpath/mkspecs/qconfig.pri"
+QTCONFIG_CONFIG="$QTCONFIG_CONFIG no_mocdepend"
[ -f "$QTCONFIG.tmp" ] && rm -f "$QTCONFIG.tmp"
-QTCONFIG_CONFIG=
if [ "$CFG_DEBUG" = "yes" ]; then
QTCONFIG_CONFIG="$QTCONFIG_CONFIG debug"
if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
@@ -4825,8 +5256,8 @@ else
QT_CONFIG="$QT_CONFIG qt_framework"
QTCONFIG_CONFIG="$QTCONFIG_CONFIG qt_framework"
fi
-if [ "$CFG_UNIVERSAL_BINARY" = "yes" ]; then
- QT_CONFIG="$QT_CONFIG x86 ppc"
+if [ "$PLATFORM_MAC" = "yes" ]; then
+ QT_CONFIG="$QT_CONFIG $CFG_MAC_ARCHS"
fi
cat >>"$QTCONFIG.tmp" <<EOF
#configuration
@@ -5000,36 +5431,36 @@ fi
if [ "$OPT_VERBOSE" = "yes" ]; then
if echo '\c' | grep '\c' >/dev/null; then
- echo -n "qmake vars ...... "
+ echo -n "qmake vars .......... "
else
- echo "qmake vars ...... \c"
+ echo "qmake vars .......... \c"
fi
cat "$QMAKE_VARS_FILE" | tr '\n' ' '
- echo "qmake switches .. $QMAKE_SWITCHES"
+ 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)"
+ echo "Debug ............... yes (combined)"
if [ "$CFG_DEBUG" = "yes" ]; then
- echo "Default Link......... debug"
+ echo "Default Link ........ debug"
else
- echo "Default Link......... release"
+ echo "Default Link ........ release"
fi
else
- echo "Debug................ $CFG_DEBUG"
+ echo "Debug ............... $CFG_DEBUG"
fi
-echo "Qt 3 compatibility... $CFG_QT3SUPPORT"
-echo "QtDBus module........ $CFG_QDBUS"
+echo "Qt 3 compatibility .. $CFG_QT3SUPPORT"
+echo "QtDBus module ....... $CFG_QDBUS"
echo "STL support ......... $CFG_STL"
echo "PCH support ......... $CFG_PRECOMPILE"
-echo "MMX/SSE support ..... $CFG_HAVE_SSE"
+echo "MMX/3DNOW/SSE/SSE2.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}"
echo "IPv6 support ........ $CFG_IPV6"
echo "IPv6 ifname support . $CFG_IPV6IFNAME"
echo "getaddrinfo support . $CFG_GETADDRINFO"
-echo "getifaddrs support... $CFG_GETIFADDRS"
+echo "getifaddrs support .. $CFG_GETIFADDRS"
echo "Accessibility ....... $CFG_ACCESSIBILITY"
echo "NIS support ......... $CFG_NIS"
echo "CUPS support ........ $CFG_CUPS"
@@ -5037,6 +5468,11 @@ echo "Iconv support ....... $CFG_ICONV"
echo "Glib support ........ $CFG_GLIB"
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
@@ -5100,6 +5536,8 @@ fi
[ "$CFG_SQL_sqlite2" != "no" ] && echo "SQLite 2 support .... $CFG_SQL_sqlite2"
[ "$CFG_SQL_sqlite" != "no" ] && echo "SQLite support ...... $CFG_SQL_sqlite ($CFG_SQLITE)"
+echo "OpenSSL support ..... $CFG_OPENSSL"
+
# complain about not being able to use dynamic plugins if we are using a static build
if [ "$CFG_SHARED" = "no" ]; then
echo
@@ -5126,26 +5564,10 @@ EXEC=""
echo "Finding project files. Please wait..."
"$outpath/bin/qmake" -prl -r "${relpath}/projects.pro"
-if [ -z "$QMAKE_PROJECTS" ]; then
- QMAKE_PROJECTS=`find "$relpath/." -name '*.pro' -print | sed 's-/\./-/-'`
-else
- QT_PROJECTS=
- for a in `echo $QMAKE_PROJECTS`; do
- put_in="$a"
- for leave_out in `echo $QMAKE_IGNORE_PROJECTS`; do
- if [ "$put_in" = "$leave_out" ]; then
- put_in=
- break;
- fi
- done
- [ '!' -z "$put_in" ] && QT_PROJECTS="$QT_PROJECTS $put_in"
- done
-fi
if [ -f "${relpath}/projects.pro" ]; then
mkfile="${outpath}/Makefile"
[ -f "$mkfile" ] && chmod +w "$mkfile"
- QTDIR="$outpath" "$outpath/bin/qmake" "QT_PROJECTS=$CFG_BUILD_PARTS" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile"
- QTDIR="$outpath" qmake-qt4 "QT_PROJECTS=$CFG_BUILD_PARTS" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile"
+ QTDIR="$outpath" qmake-qt4 -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile"
fi
# .projects -> projects to process
@@ -5154,6 +5576,7 @@ fi
# .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
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index ada959b36843..72b0680b6a32 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -61,7 +61,6 @@ USE_QT_VER+= 4
QT_COMPONENTS= gui corelib xml qtestlib
#BUILD_WRKSRC= ${WRKSRC}/qt4
INSTALL_WRKSRC= ${WRKSRC}/qt4
-.include "${PORTSDIR}/Mk/bsd.kde.mk"
.else
CONFIGURE_ARGS+=--disable-poppler-qt4
.endif
diff --git a/graphics/qt4-iconengines/Makefile b/graphics/qt4-iconengines/Makefile
index c93bdf1ba94e..8721d617a53d 100644
--- a/graphics/qt4-iconengines/Makefile
+++ b/graphics/qt4-iconengines/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= iconengines
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= graphics
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,26 +18,13 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SVG icon engine plugin
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4
-LIB_DEPENDS= QtCore:${PORTSDIR}/devel/qt4-corelib \
- QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
- QtSvg:${PORTSDIR}/graphics/qt4-svg \
- QtXml:${PORTSDIR}/textproc/qt4-xml
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc corelib gui svg xml
+QT_NONSTANDARD= yes
+QT_DIST= yes
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
-
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/graphics/qt4-iconengines/distinfo b/graphics/qt4-iconengines/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/graphics/qt4-iconengines/distinfo
+++ b/graphics/qt4-iconengines/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/graphics/qt4-imageformats/Makefile b/graphics/qt4-imageformats/Makefile
index 0fd8f096b6a8..0598124b8063 100644
--- a/graphics/qt4-imageformats/Makefile
+++ b/graphics/qt4-imageformats/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= imageformats
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= graphics
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,28 +18,18 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt imageformat plugins for GIF, JPEG, MNG and SVG
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4 \
- rcc:${PORTSDIR}/devel/qt4-rcc
-LIB_DEPENDS= QtCore:${PORTSDIR}/devel/qt4-corelib \
- QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
- QtSvg:${PORTSDIR}/graphics/qt4-svg \
- QtXml:${PORTSDIR}/textproc/qt4-xml \
- jpeg:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
+ mng:${PORTSDIR}/graphics/libmng \
+ png:${PORTSDIR}/graphics/png \
+ tiff:${PORTSDIR}/graphics/tiff
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc rcc corelib gui svg xml
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/graphics/qt4-imageformats/distinfo b/graphics/qt4-imageformats/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/graphics/qt4-imageformats/distinfo
+++ b/graphics/qt4-imageformats/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/graphics/qt4-imageformats/pkg-plist b/graphics/qt4-imageformats/pkg-plist
index 80f0c38e7f48..4f61b248e9a8 100644
--- a/graphics/qt4-imageformats/pkg-plist
+++ b/graphics/qt4-imageformats/pkg-plist
@@ -6,4 +6,6 @@ lib/plugins/imageformats/libqmng.so
lib/plugins/imageformats/libqmng.so.debug
lib/plugins/imageformats/libqsvg.so
lib/plugins/imageformats/libqsvg.so.debug
+lib/plugins/imageformats/libqtiff.so
+lib/plugins/imageformats/libqtiff.so.debug
@dirrm lib/plugins/imageformats
diff --git a/graphics/qt4-pixeltool/Makefile b/graphics/qt4-pixeltool/Makefile
index 095dc633f8b4..bd8fe5ff3a64 100644
--- a/graphics/qt4-pixeltool/Makefile
+++ b/graphics/qt4-pixeltool/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= pixeltool
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= graphics
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,28 +18,13 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt screen magnification utility
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4 \
- uic-qt4:${PORTSDIR}/devel/qt4-uic
-
-LIB_DEPENDS= QtAssistantClient:${PORTSDIR}/devel/qt4-libqtassistantclient \
- QtCore:${PORTSDIR}/devel/qt4-corelib \
- QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
- QtNetwork:${PORTSDIR}/net/qt4-network
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc uic assistantclient corelib gui network
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/graphics/qt4-pixeltool/distinfo b/graphics/qt4-pixeltool/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/graphics/qt4-pixeltool/distinfo
+++ b/graphics/qt4-pixeltool/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/graphics/qt4-svg/Makefile b/graphics/qt4-svg/Makefile
index af9a6cc27fd6..67b4ada6bb66 100644
--- a/graphics/qt4-svg/Makefile
+++ b/graphics/qt4-svg/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= svg
-PORTVERSION= 4.2.3
-PORTREVISION= 2
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= graphics
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,26 +18,14 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SVG library
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4
-LIB_DEPENDS?= QtCore:${PORTSDIR}/devel/qt4-corelib \
- QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
- QtXml:${PORTSDIR}/textproc/qt4-xml
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc corelib gui xml
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
@@ -77,11 +65,11 @@ pre-configure:
${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc
post-configure:
- ${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtSvg.pc|${PREFIX}/libdata/pkgconfig/QtSvg.pc|g' \
- ${WRKSRC}/Makefile
+ ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+ -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${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/*Qt*
+ ${WRKSRC}/../../lib/pkgconfig/*Qt*
.include <bsd.port.post.mk>
diff --git a/graphics/qt4-svg/distinfo b/graphics/qt4-svg/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/graphics/qt4-svg/distinfo
+++ b/graphics/qt4-svg/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/graphics/qt4-svg/pkg-plist b/graphics/qt4-svg/pkg-plist
index 8acbce3e0946..7699fb340b95 100644
--- a/graphics/qt4-svg/pkg-plist
+++ b/graphics/qt4-svg/pkg-plist
@@ -1,20 +1,22 @@
include/Qt/QtSvg
include/Qt/qgraphicssvgitem.h
+include/Qt/qsvggenerator.h
include/Qt/qsvgrenderer.h
include/Qt/qsvgwidget.h
include/QtSvg/QGraphicsSvgItem
+include/QtSvg/QSvgGenerator
include/QtSvg/QSvgRenderer
include/QtSvg/QSvgWidget
include/QtSvg/QtSvg
include/QtSvg/qgraphicssvgitem.h
+include/QtSvg/qsvggenerator.h
include/QtSvg/qsvgrenderer.h
include/QtSvg/qsvgwidget.h
-libdata/pkgconfig/QtSvg.pc
lib/libQtSvg.la
lib/libQtSvg.prl
lib/libQtSvg.so
lib/libQtSvg.so.4
-lib/libQtSvg.so.4.2
-lib/libQtSvg.so.4.2.3
-lib/libQtSvg.so.4.2.3.debug
+lib/libQtSvg.so.4.3
+lib/libQtSvg.so.4.3.0
+libdata/pkgconfig/QtSvg.pc
@dirrm include/QtSvg
diff --git a/japanese/qt4-codecs-jp/Makefile b/japanese/qt4-codecs-jp/Makefile
index e73aeec0005e..462b32e05169 100644
--- a/japanese/qt4-codecs-jp/Makefile
+++ b/japanese/qt4-codecs-jp/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= codecs
-PORTVERSION= 4.2.3
+PORTVERSION= ${QT4_VERSION}
CATEGORIES?= japanese
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,26 +18,16 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt EUC-JP/JIS codec plugins
-BUILD_DEPENDS= qmake-qt4:${PORTSDIR}/devel/qmake4
-LIB_DEPENDS= QtCore:${PORTSDIR}/devel/qt4-corelib
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake corelib
+QT_NONSTANDARD= yes
+QT_DIST= yes
USE_GCC= 3.4+
#USE_BZIP2= yes
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib \
- -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin -v \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/japanese/qt4-codecs-jp/distinfo b/japanese/qt4-codecs-jp/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/japanese/qt4-codecs-jp/distinfo
+++ b/japanese/qt4-codecs-jp/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/korean/qt4-codecs-kr/Makefile b/korean/qt4-codecs-kr/Makefile
index dba83613b340..69d008d483b6 100644
--- a/korean/qt4-codecs-kr/Makefile
+++ b/korean/qt4-codecs-kr/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= codecs
-PORTVERSION= 4.2.3
+PORTVERSION= ${QT4_VERSION}
CATEGORIES?= korean
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,26 +18,16 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt EUC-KR codec plugin
-BUILD_DEPENDS= qmake-qt4:${PORTSDIR}/devel/qmake4
-LIB_DEPENDS= QtCore:${PORTSDIR}/devel/qt4-corelib
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake corelib
+QT_NONSTANDARD= yes
+QT_DIST= yes
USE_GCC= 3.4+
#USE_BZIP2= yes
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib \
- -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin -v \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/korean/qt4-codecs-kr/distinfo b/korean/qt4-codecs-kr/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/korean/qt4-codecs-kr/distinfo
+++ b/korean/qt4-codecs-kr/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/misc/qt4-doc/Makefile b/misc/qt4-doc/Makefile
index 1b098555112b..ce26f6853704 100644
--- a/misc/qt4-doc/Makefile
+++ b/misc/qt4-doc/Makefile
@@ -7,29 +7,20 @@
#
PORTNAME= doc
-PORTVERSION= 4.2.3
+PORTVERSION= ${QT4_VERSION}
CATEGORIES?= misc
MASTER_SITES= ${MASTER_SITE_QT}
-PKGNAMEPREFIX= qt4-
+PKGNAMEPREFIX= qt4-
DISTNAME= qt-x11-opensource-src-${PORTVERSION}
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Multiplatform C++ application framework
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+QT_DIST= yes
NO_BUILD= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
@@ -53,4 +44,5 @@ do-install:
${RM} -f ${WRKSRC}/doc/html/qmake*
${CP} -Rp ${WRKSRC}/doc/html ${DOCSDIR}
+.include "${.CURDIR}/../../Mk/bsd.qt.mk"
.include <bsd.port.mk>
diff --git a/misc/qt4-doc/distinfo b/misc/qt4-doc/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/misc/qt4-doc/distinfo
+++ b/misc/qt4-doc/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/misc/qt4-doc/pkg-plist b/misc/qt4-doc/pkg-plist
index 316c7f435cf4..8528b7770829 100644
--- a/misc/qt4-doc/pkg-plist
+++ b/misc/qt4-doc/pkg-plist
@@ -3,6 +3,7 @@
%%DOCSDIR%%/html/abstractwidgets.html
%%DOCSDIR%%/html/accelerators.html
%%DOCSDIR%%/html/accessibility.html
+%%DOCSDIR%%/html/accessible.html
%%DOCSDIR%%/html/activeqt-comapp-main-cpp.html
%%DOCSDIR%%/html/activeqt-comapp.html
%%DOCSDIR%%/html/activeqt-dotnet.html
@@ -36,6 +37,7 @@
%%DOCSDIR%%/html/activeqt-testcon.html
%%DOCSDIR%%/html/activeqt-tools.html
%%DOCSDIR%%/html/activeqt-webbrowser-main-cpp.html
+%%DOCSDIR%%/html/activeqt-webbrowser-webaxwidget-h.html
%%DOCSDIR%%/html/activeqt-webbrowser.html
%%DOCSDIR%%/html/activeqt-wrapper-main-cpp.html
%%DOCSDIR%%/html/activeqt-wrapper.html
@@ -55,7 +57,7 @@
%%DOCSDIR%%/html/assistant-simpletextviewer.html
%%DOCSDIR%%/html/assistant.dcf
%%DOCSDIR%%/html/atomic-operations.html
-%%DOCSDIR%%/html/basic.html
+%%DOCSDIR%%/html/basicwidgets.html
%%DOCSDIR%%/html/bughowto.html
%%DOCSDIR%%/html/buildsystem.html
%%DOCSDIR%%/html/classes.html
@@ -72,6 +74,7 @@
%%DOCSDIR%%/html/codecs.html
%%DOCSDIR%%/html/commercialeditions.html
%%DOCSDIR%%/html/compatclasses.html
+%%DOCSDIR%%/html/compiler-notes.html
%%DOCSDIR%%/html/console-edition-classes.html
%%DOCSDIR%%/html/containers.html
%%DOCSDIR%%/html/coordsys.html
@@ -156,6 +159,15 @@
%%DOCSDIR%%/html/demos-textedit-textedit-h.html
%%DOCSDIR%%/html/demos-textedit-textedit-qrc.html
%%DOCSDIR%%/html/demos-textedit.html
+%%DOCSDIR%%/html/demos-undo-commands-cpp.html
+%%DOCSDIR%%/html/demos-undo-commands-h.html
+%%DOCSDIR%%/html/demos-undo-document-cpp.html
+%%DOCSDIR%%/html/demos-undo-document-h.html
+%%DOCSDIR%%/html/demos-undo-main-cpp.html
+%%DOCSDIR%%/html/demos-undo-mainwindow-cpp.html
+%%DOCSDIR%%/html/demos-undo-mainwindow-h.html
+%%DOCSDIR%%/html/demos-undo-undo-qrc.html
+%%DOCSDIR%%/html/demos-undo.html
%%DOCSDIR%%/html/demos.html
%%DOCSDIR%%/html/deployment-mac.html
%%DOCSDIR%%/html/deployment-windows.html
@@ -232,6 +244,11 @@
%%DOCSDIR%%/html/desktop-systray-window-h.html
%%DOCSDIR%%/html/desktop-systray.html
%%DOCSDIR%%/html/desktop.html
+%%DOCSDIR%%/html/dialogs-classwizard-classwizard-cpp.html
+%%DOCSDIR%%/html/dialogs-classwizard-classwizard-h.html
+%%DOCSDIR%%/html/dialogs-classwizard-classwizard-qrc.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-qrc.html
@@ -247,6 +264,11 @@
%%DOCSDIR%%/html/dialogs-findfiles-window-cpp.html
%%DOCSDIR%%/html/dialogs-findfiles-window-h.html
%%DOCSDIR%%/html/dialogs-findfiles.html
+%%DOCSDIR%%/html/dialogs-licensewizard-licensewizard-cpp.html
+%%DOCSDIR%%/html/dialogs-licensewizard-licensewizard-h.html
+%%DOCSDIR%%/html/dialogs-licensewizard-licensewizard-qrc.html
+%%DOCSDIR%%/html/dialogs-licensewizard-main-cpp.html
+%%DOCSDIR%%/html/dialogs-licensewizard.html
%%DOCSDIR%%/html/dialogs-standarddialogs-dialog-cpp.html
%%DOCSDIR%%/html/dialogs-standarddialogs-dialog-h.html
%%DOCSDIR%%/html/dialogs-standarddialogs-main-cpp.html
@@ -255,6 +277,8 @@
%%DOCSDIR%%/html/dialogs-tabdialog-tabdialog-cpp.html
%%DOCSDIR%%/html/dialogs-tabdialog-tabdialog-h.html
%%DOCSDIR%%/html/dialogs-tabdialog.html
+%%DOCSDIR%%/html/dialogs-trivialwizard-trivialwizard-cpp.html
+%%DOCSDIR%%/html/dialogs-trivialwizard.html
%%DOCSDIR%%/html/dialogs.html
%%DOCSDIR%%/html/dnd.html
%%DOCSDIR%%/html/draganddrop-draggableicons-draggableicons-qrc.html
@@ -292,6 +316,7 @@
%%DOCSDIR%%/html/draganddrop-puzzle-puzzlewidget-h.html
%%DOCSDIR%%/html/draganddrop-puzzle.html
%%DOCSDIR%%/html/draganddrop.html
+%%DOCSDIR%%/html/ecmascript.html
%%DOCSDIR%%/html/editions.html
%%DOCSDIR%%/html/environment.html
%%DOCSDIR%%/html/events.html
@@ -306,6 +331,7 @@
%%DOCSDIR%%/html/gallery-motif.html
%%DOCSDIR%%/html/gallery-plastique.html
%%DOCSDIR%%/html/gallery-windows.html
+%%DOCSDIR%%/html/gallery-windowsvista.html
%%DOCSDIR%%/html/gallery-windowsxp.html
%%DOCSDIR%%/html/gallery.html
%%DOCSDIR%%/html/geomanagement.html
@@ -316,6 +342,19 @@
%%DOCSDIR%%/html/graphicsview-collidingmice-mouse-cpp.html
%%DOCSDIR%%/html/graphicsview-collidingmice-mouse-h.html
%%DOCSDIR%%/html/graphicsview-collidingmice.html
+%%DOCSDIR%%/html/graphicsview-diagramscene-arrow-cpp.html
+%%DOCSDIR%%/html/graphicsview-diagramscene-arrow-h.html
+%%DOCSDIR%%/html/graphicsview-diagramscene-diagramitem-cpp.html
+%%DOCSDIR%%/html/graphicsview-diagramscene-diagramitem-h.html
+%%DOCSDIR%%/html/graphicsview-diagramscene-diagramscene-cpp.html
+%%DOCSDIR%%/html/graphicsview-diagramscene-diagramscene-h.html
+%%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-main-cpp.html
+%%DOCSDIR%%/html/graphicsview-diagramscene-mainwindow-cpp.html
+%%DOCSDIR%%/html/graphicsview-diagramscene-mainwindow-h.html
+%%DOCSDIR%%/html/graphicsview-diagramscene.html
%%DOCSDIR%%/html/graphicsview-dragdroprobot-coloritem-cpp.html
%%DOCSDIR%%/html/graphicsview-dragdroprobot-coloritem-h.html
%%DOCSDIR%%/html/graphicsview-dragdroprobot-main-cpp.html
@@ -362,6 +401,8 @@
%%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/affine-demo.png
%%DOCSDIR%%/html/images/alphachannelimage.png
%%DOCSDIR%%/html/images/alphafill.png
@@ -403,6 +444,7 @@
%%DOCSDIR%%/html/images/calculatorbuilder-example.png
%%DOCSDIR%%/html/images/calculatorform-example.png
%%DOCSDIR%%/html/images/calendar-example.png
+%%DOCSDIR%%/html/images/calendarwidgetexample.png
%%DOCSDIR%%/html/images/cde-calendarwidget.png
%%DOCSDIR%%/html/images/cde-checkbox.png
%%DOCSDIR%%/html/images/cde-combobox.png
@@ -434,13 +476,14 @@
%%DOCSDIR%%/html/images/chart-example.png
%%DOCSDIR%%/html/images/chat-example.png
%%DOCSDIR%%/html/images/chip-demo.png
+%%DOCSDIR%%/html/images/classwizard-flow.png
+%%DOCSDIR%%/html/images/classwizard.png
%%DOCSDIR%%/html/images/cleanlooks-calendarwidget.png
%%DOCSDIR%%/html/images/cleanlooks-checkbox.png
%%DOCSDIR%%/html/images/cleanlooks-combobox.png
%%DOCSDIR%%/html/images/cleanlooks-dateedit.png
%%DOCSDIR%%/html/images/cleanlooks-datetimeedit.png
%%DOCSDIR%%/html/images/cleanlooks-dial.png
-%%DOCSDIR%%/html/images/cleanlooks-dialogbuttonbox.png
%%DOCSDIR%%/html/images/cleanlooks-doublespinbox.png
%%DOCSDIR%%/html/images/cleanlooks-fontcombobox.png
%%DOCSDIR%%/html/images/cleanlooks-frame.png
@@ -465,12 +508,14 @@
%%DOCSDIR%%/html/images/cleanlooks-treeview.png
%%DOCSDIR%%/html/images/codecs-example.png
%%DOCSDIR%%/html/images/collidingmice-example.png
+%%DOCSDIR%%/html/images/coloreditorfactoryimage.png
%%DOCSDIR%%/html/images/completer-example.png
%%DOCSDIR%%/html/images/composition-demo.png
%%DOCSDIR%%/html/images/concentriccircles-example.png
%%DOCSDIR%%/html/images/configdialog-example.png
%%DOCSDIR%%/html/images/conicalGradient.png
%%DOCSDIR%%/html/images/containerextension-example.png
+%%DOCSDIR%%/html/images/context2d-example.png
%%DOCSDIR%%/html/images/coordinatesystem-analogclock.png
%%DOCSDIR%%/html/images/coordinatesystem-line-antialias.png
%%DOCSDIR%%/html/images/coordinatesystem-line-raster.png
@@ -501,6 +546,7 @@
%%DOCSDIR%%/html/images/customsortfiltermodel-example.png
%%DOCSDIR%%/html/images/customwidgetplugin-example.png
%%DOCSDIR%%/html/images/datetimewidgets.png
+%%DOCSDIR%%/html/images/defaultprototypes-example.png
%%DOCSDIR%%/html/images/deform-demo.png
%%DOCSDIR%%/html/images/dependencies.png
%%DOCSDIR%%/html/images/deployment-mac-application.png
@@ -508,6 +554,7 @@
%%DOCSDIR%%/html/images/deployment-windows-depends.png
%%DOCSDIR%%/html/images/designer-action-editor.png
%%DOCSDIR%%/html/images/designer-adding-dockwidget.png
+%%DOCSDIR%%/html/images/designer-adding-dynamic-property.png
%%DOCSDIR%%/html/images/designer-adding-menu-action.png
%%DOCSDIR%%/html/images/designer-adding-toolbar-action.png
%%DOCSDIR%%/html/images/designer-buddy-making.png
@@ -528,6 +575,7 @@
%%DOCSDIR%%/html/images/designer-containers-stackedwidget.png
%%DOCSDIR%%/html/images/designer-containers-tabwidget.png
%%DOCSDIR%%/html/images/designer-containers-toolbox.png
+%%DOCSDIR%%/html/images/designer-creating-dynamic-property.png
%%DOCSDIR%%/html/images/designer-creating-menu-entry1.png
%%DOCSDIR%%/html/images/designer-creating-menu-entry2.png
%%DOCSDIR%%/html/images/designer-creating-menu-entry3.png
@@ -567,6 +615,7 @@
%%DOCSDIR%%/html/images/designer-widget-box.png
%%DOCSDIR%%/html/images/designer-widget-tool.png
%%DOCSDIR%%/html/images/diagonalGradient.png
+%%DOCSDIR%%/html/images/diagramscene.png
%%DOCSDIR%%/html/images/digitalclock-example.png
%%DOCSDIR%%/html/images/dirview-example.png
%%DOCSDIR%%/html/images/dockwidgets-example.png
@@ -575,7 +624,9 @@
%%DOCSDIR%%/html/images/dragdroprobot-example.png
%%DOCSDIR%%/html/images/draggableicons-example.png
%%DOCSDIR%%/html/images/draggabletext-example.png
+%%DOCSDIR%%/html/images/drilldown-example.png
%%DOCSDIR%%/html/images/dropsite-example.png
+%%DOCSDIR%%/html/images/echopluginexample.png
%%DOCSDIR%%/html/images/elasticnodes-example.png
%%DOCSDIR%%/html/images/extension-example.png
%%DOCSDIR%%/html/images/extension_more.png
@@ -599,14 +650,13 @@
%%DOCSDIR%%/html/images/graphicsview-ellipseitem.png
%%DOCSDIR%%/html/images/graphicsview-items.png
%%DOCSDIR%%/html/images/graphicsview-lineitem.png
-%%DOCSDIR%%/html/images/graphicsview-map.png
%%DOCSDIR%%/html/images/graphicsview-parentchild.png
%%DOCSDIR%%/html/images/graphicsview-pathitem.png
%%DOCSDIR%%/html/images/graphicsview-pixmapitem.png
%%DOCSDIR%%/html/images/graphicsview-polygonitem.png
%%DOCSDIR%%/html/images/graphicsview-rectitem.png
-%%DOCSDIR%%/html/images/graphicsview-shapes.png
-%%DOCSDIR%%/html/images/graphicsview-text.png
+%%DOCSDIR%%/html/images/graphicsview-simpletextitem.png
+%%DOCSDIR%%/html/images/graphicsview-textitem.png
%%DOCSDIR%%/html/images/graphicsview-view.png
%%DOCSDIR%%/html/images/graphicsview-zorder.png
%%DOCSDIR%%/html/images/gridlayout.png
@@ -618,11 +668,11 @@
%%DOCSDIR%%/html/images/icon.png
%%DOCSDIR%%/html/images/icons-example.png
%%DOCSDIR%%/html/images/icons-view-menu.png
-%%DOCSDIR%%/html/images/icons_find_mess.png
%%DOCSDIR%%/html/images/icons_find_normal.png
%%DOCSDIR%%/html/images/icons_find_normal_disabled.png
%%DOCSDIR%%/html/images/icons_images_groupbox.png
%%DOCSDIR%%/html/images/icons_monkey.png
+%%DOCSDIR%%/html/images/icons_monkey_active.png
%%DOCSDIR%%/html/images/icons_monkey_mess.png
%%DOCSDIR%%/html/images/icons_preview_area.png
%%DOCSDIR%%/html/images/icons_qtopia_16x16.png
@@ -648,6 +698,8 @@
%%DOCSDIR%%/html/images/javaiterators2.png
%%DOCSDIR%%/html/images/layout1.png
%%DOCSDIR%%/html/images/layout2.png
+%%DOCSDIR%%/html/images/licensewizard-example.png
+%%DOCSDIR%%/html/images/licensewizard-flow.png
%%DOCSDIR%%/html/images/lineedits-example.png
%%DOCSDIR%%/html/images/linguist-arrowpad_en.png
%%DOCSDIR%%/html/images/linguist-arrowpad_fr.png
@@ -710,17 +762,22 @@
%%DOCSDIR%%/html/images/macintosh-toolbox.png
%%DOCSDIR%%/html/images/macintosh-toolbutton.png
%%DOCSDIR%%/html/images/macintosh-treeview.png
+%%DOCSDIR%%/html/images/macintosh-unified-toolbar.png
+%%DOCSDIR%%/html/images/mainwindow-custom-dock.png
%%DOCSDIR%%/html/images/mainwindow-demo.png
%%DOCSDIR%%/html/images/mainwindow-docks-example.png
%%DOCSDIR%%/html/images/mainwindow-docks.png
+%%DOCSDIR%%/html/images/mainwindow-vertical-dock.png
+%%DOCSDIR%%/html/images/mainwindow-vertical-tabs.png
%%DOCSDIR%%/html/images/mainwindowlayout.png
-%%DOCSDIR%%/html/images/mandelbrot.png
+%%DOCSDIR%%/html/images/mandelbrot-example.png
%%DOCSDIR%%/html/images/mandelbrot_scroll1.png
%%DOCSDIR%%/html/images/mandelbrot_scroll2.png
%%DOCSDIR%%/html/images/mandelbrot_scroll3.png
%%DOCSDIR%%/html/images/mandelbrot_zoom1.png
%%DOCSDIR%%/html/images/mandelbrot_zoom2.png
%%DOCSDIR%%/html/images/mandelbrot_zoom3.png
+%%DOCSDIR%%/html/images/masterdetail-example.png
%%DOCSDIR%%/html/images/mdi-example.png
%%DOCSDIR%%/html/images/menus-example.png
%%DOCSDIR%%/html/images/modelindex-no-parent.png
@@ -793,9 +850,8 @@
%%DOCSDIR%%/html/images/plastique-dateedit.png
%%DOCSDIR%%/html/images/plastique-datetimeedit.png
%%DOCSDIR%%/html/images/plastique-dial.png
-%%DOCSDIR%%/html/images/plastique-dialogbuttonbox.png
%%DOCSDIR%%/html/images/plastique-doublespinbox.png
-%%DOCSDIR%%/html/images/plastique-fontcombobox-open.png
+%%DOCSDIR%%/html/images/plastique-filedialog.png
%%DOCSDIR%%/html/images/plastique-fontcombobox.png
%%DOCSDIR%%/html/images/plastique-fontdialog.png
%%DOCSDIR%%/html/images/plastique-frame.png
@@ -847,6 +903,7 @@
%%DOCSDIR%%/html/images/qcolor-saturation.png
%%DOCSDIR%%/html/images/qcolor-value.png
%%DOCSDIR%%/html/images/qconicalgradient.png
+%%DOCSDIR%%/html/images/qdatawidgetmapper-simple.png
%%DOCSDIR%%/html/images/qdesktopwidget.png
%%DOCSDIR%%/html/images/qdockwindow.png
%%DOCSDIR%%/html/images/qerrormessage.png
@@ -877,6 +934,8 @@
%%DOCSDIR%%/html/images/qmatrix-combinedtransformation.png
%%DOCSDIR%%/html/images/qmatrix-representation.png
%%DOCSDIR%%/html/images/qmatrix-simpletransformation.png
+%%DOCSDIR%%/html/images/qmdiarea-arrange.png
+%%DOCSDIR%%/html/images/qmdisubwindowlayout.png
%%DOCSDIR%%/html/images/qmessagebox-crit.png
%%DOCSDIR%%/html/images/qmessagebox-info.png
%%DOCSDIR%%/html/images/qmessagebox-quest.png
@@ -970,7 +1029,6 @@
%%DOCSDIR%%/html/images/qtableitems.png
%%DOCSDIR%%/html/images/qtabletevent-tilt.png
%%DOCSDIR%%/html/images/qtconfig-appearance.png
-%%DOCSDIR%%/html/images/qtdemo-example.png
%%DOCSDIR%%/html/images/qtdesignerextensions.png
%%DOCSDIR%%/html/images/qtdesignerscreenshot.png
%%DOCSDIR%%/html/images/qtextblock-sequence.png
@@ -1001,6 +1059,18 @@
%%DOCSDIR%%/html/images/qtopiacore-setwindowattribute.png
%%DOCSDIR%%/html/images/qtopiacore-vanilla.png
%%DOCSDIR%%/html/images/qtopiacore-virtualframebuffer.png
+%%DOCSDIR%%/html/images/qtscript-calculator.png
+%%DOCSDIR%%/html/images/qtscript-context2d.png
+%%DOCSDIR%%/html/images/qtwizard-aero1.png
+%%DOCSDIR%%/html/images/qtwizard-aero2.png
+%%DOCSDIR%%/html/images/qtwizard-classic1.png
+%%DOCSDIR%%/html/images/qtwizard-classic2.png
+%%DOCSDIR%%/html/images/qtwizard-mac1.png
+%%DOCSDIR%%/html/images/qtwizard-mac2.png
+%%DOCSDIR%%/html/images/qtwizard-macpage.png
+%%DOCSDIR%%/html/images/qtwizard-modern1.png
+%%DOCSDIR%%/html/images/qtwizard-modern2.png
+%%DOCSDIR%%/html/images/qtwizard-nonmacpage.png
%%DOCSDIR%%/html/images/querymodel-example.png
%%DOCSDIR%%/html/images/qundoview.png
%%DOCSDIR%%/html/images/qurl-authority.png
@@ -1024,6 +1094,7 @@
%%DOCSDIR%%/html/images/resources.png
%%DOCSDIR%%/html/images/richtext-document.png
%%DOCSDIR%%/html/images/rintersect.png
+%%DOCSDIR%%/html/images/rsslistingexample.png
%%DOCSDIR%%/html/images/rsubtract.png
%%DOCSDIR%%/html/images/runion.png
%%DOCSDIR%%/html/images/rxor.png
@@ -1050,6 +1121,7 @@
%%DOCSDIR%%/html/images/simpletextviewer-findfiledialog.png
%%DOCSDIR%%/html/images/simpletextviewer-mainwindow.png
%%DOCSDIR%%/html/images/simpletreemodel-example.png
+%%DOCSDIR%%/html/images/simplewidgetmapper-example.png
%%DOCSDIR%%/html/images/sliders-example.png
%%DOCSDIR%%/html/images/spinboxdelegate-example.png
%%DOCSDIR%%/html/images/spinboxes-example.png
@@ -1057,8 +1129,10 @@
%%DOCSDIR%%/html/images/sqlbrowser-demo.png
%%DOCSDIR%%/html/images/standard-views.png
%%DOCSDIR%%/html/images/standarddialogs-example.png
+%%DOCSDIR%%/html/images/stardelegate.png
%%DOCSDIR%%/html/images/stliterators1.png
%%DOCSDIR%%/html/images/stringlistmodel.png
+%%DOCSDIR%%/html/images/stylepluginexample.png
%%DOCSDIR%%/html/images/styles-3d.png
%%DOCSDIR%%/html/images/styles-aliasing.png
%%DOCSDIR%%/html/images/styles-disabledwood.png
@@ -1094,6 +1168,7 @@
%%DOCSDIR%%/html/images/t9_2.png
%%DOCSDIR%%/html/images/tabdialog-example.png
%%DOCSDIR%%/html/images/tablemodel-example.png
+%%DOCSDIR%%/html/images/tabletexample.png
%%DOCSDIR%%/html/images/taskmenuextension-dialog.png
%%DOCSDIR%%/html/images/taskmenuextension-example-faded.png
%%DOCSDIR%%/html/images/taskmenuextension-menu.png
@@ -1107,10 +1182,18 @@
%%DOCSDIR%%/html/images/torrent-example.png
%%DOCSDIR%%/html/images/transformations-example.png
%%DOCSDIR%%/html/images/treemodel-structure.png
+%%DOCSDIR%%/html/images/treemodelcompleter-example.png
+%%DOCSDIR%%/html/images/trivialwizard-example-conclusion.png
+%%DOCSDIR%%/html/images/trivialwizard-example-flow.png
+%%DOCSDIR%%/html/images/trivialwizard-example-introduction.png
+%%DOCSDIR%%/html/images/trivialwizard-example-registration.png
%%DOCSDIR%%/html/images/trolltech-logo.png
%%DOCSDIR%%/html/images/tutorial8-layout.png
%%DOCSDIR%%/html/images/tutorial8-reallayout.png
%%DOCSDIR%%/html/images/udppackets.png
+%%DOCSDIR%%/html/images/undodemo.png
+%%DOCSDIR%%/html/images/undoframeworkexample.png
+%%DOCSDIR%%/html/images/wVista-Cert-border-small.png
%%DOCSDIR%%/html/images/whatsthis.png
%%DOCSDIR%%/html/images/wiggly-example.png
%%DOCSDIR%%/html/images/windowflags-example.png
@@ -1143,6 +1226,33 @@
%%DOCSDIR%%/html/images/windows-toolbox.png
%%DOCSDIR%%/html/images/windows-toolbutton.png
%%DOCSDIR%%/html/images/windows-treeview.png
+%%DOCSDIR%%/html/images/windowsvista-calendarwidget.png
+%%DOCSDIR%%/html/images/windowsvista-checkbox.png
+%%DOCSDIR%%/html/images/windowsvista-combobox.png
+%%DOCSDIR%%/html/images/windowsvista-dateedit.png
+%%DOCSDIR%%/html/images/windowsvista-datetimeedit.png
+%%DOCSDIR%%/html/images/windowsvista-dial.png
+%%DOCSDIR%%/html/images/windowsvista-doublespinbox.png
+%%DOCSDIR%%/html/images/windowsvista-fontcombobox.png
+%%DOCSDIR%%/html/images/windowsvista-frame.png
+%%DOCSDIR%%/html/images/windowsvista-groupbox.png
+%%DOCSDIR%%/html/images/windowsvista-horizontalscrollbar.png
+%%DOCSDIR%%/html/images/windowsvista-label.png
+%%DOCSDIR%%/html/images/windowsvista-lcdnumber.png
+%%DOCSDIR%%/html/images/windowsvista-lineedit.png
+%%DOCSDIR%%/html/images/windowsvista-listview.png
+%%DOCSDIR%%/html/images/windowsvista-progressbar.png
+%%DOCSDIR%%/html/images/windowsvista-pushbutton.png
+%%DOCSDIR%%/html/images/windowsvista-radiobutton.png
+%%DOCSDIR%%/html/images/windowsvista-slider.png
+%%DOCSDIR%%/html/images/windowsvista-spinbox.png
+%%DOCSDIR%%/html/images/windowsvista-tableview.png
+%%DOCSDIR%%/html/images/windowsvista-tabwidget.png
+%%DOCSDIR%%/html/images/windowsvista-textedit.png
+%%DOCSDIR%%/html/images/windowsvista-timeedit.png
+%%DOCSDIR%%/html/images/windowsvista-toolbox.png
+%%DOCSDIR%%/html/images/windowsvista-toolbutton.png
+%%DOCSDIR%%/html/images/windowsvista-treeview.png
%%DOCSDIR%%/html/images/windowsxp-calendarwidget.png
%%DOCSDIR%%/html/images/windowsxp-checkbox.png
%%DOCSDIR%%/html/images/windowsxp-combobox.png
@@ -1194,6 +1304,12 @@
%%DOCSDIR%%/html/itemviews-chart-pieview-cpp.html
%%DOCSDIR%%/html/itemviews-chart-pieview-h.html
%%DOCSDIR%%/html/itemviews-chart.html
+%%DOCSDIR%%/html/itemviews-coloreditorfactory-colorlisteditor-cpp.html
+%%DOCSDIR%%/html/itemviews-coloreditorfactory-colorlisteditor-h.html
+%%DOCSDIR%%/html/itemviews-coloreditorfactory-main-cpp.html
+%%DOCSDIR%%/html/itemviews-coloreditorfactory-window-cpp.html
+%%DOCSDIR%%/html/itemviews-coloreditorfactory-window-h.html
+%%DOCSDIR%%/html/itemviews-coloreditorfactory.html
%%DOCSDIR%%/html/itemviews-customsortfiltermodel-main-cpp.html
%%DOCSDIR%%/html/itemviews-customsortfiltermodel-mysortfilterproxymodel-cpp.html
%%DOCSDIR%%/html/itemviews-customsortfiltermodel-mysortfilterproxymodel-h.html
@@ -1235,10 +1351,22 @@
%%DOCSDIR%%/html/itemviews-simpletreemodel-treemodel-cpp.html
%%DOCSDIR%%/html/itemviews-simpletreemodel-treemodel-h.html
%%DOCSDIR%%/html/itemviews-simpletreemodel.html
+%%DOCSDIR%%/html/itemviews-simplewidgetmapper-main-cpp.html
+%%DOCSDIR%%/html/itemviews-simplewidgetmapper-window-cpp.html
+%%DOCSDIR%%/html/itemviews-simplewidgetmapper-window-h.html
+%%DOCSDIR%%/html/itemviews-simplewidgetmapper.html
%%DOCSDIR%%/html/itemviews-spinboxdelegate-delegate-cpp.html
%%DOCSDIR%%/html/itemviews-spinboxdelegate-delegate-h.html
%%DOCSDIR%%/html/itemviews-spinboxdelegate-main-cpp.html
%%DOCSDIR%%/html/itemviews-spinboxdelegate.html
+%%DOCSDIR%%/html/itemviews-stardelegate-main-cpp.html
+%%DOCSDIR%%/html/itemviews-stardelegate-stardelegate-cpp.html
+%%DOCSDIR%%/html/itemviews-stardelegate-stardelegate-h.html
+%%DOCSDIR%%/html/itemviews-stardelegate-stareditor-cpp.html
+%%DOCSDIR%%/html/itemviews-stardelegate-stareditor-h.html
+%%DOCSDIR%%/html/itemviews-stardelegate-starrating-cpp.html
+%%DOCSDIR%%/html/itemviews-stardelegate-starrating-h.html
+%%DOCSDIR%%/html/itemviews-stardelegate.html
%%DOCSDIR%%/html/known-issues.html
%%DOCSDIR%%/html/layout.html
%%DOCSDIR%%/html/layouts-basiclayouts-dialog-cpp.html
@@ -1282,6 +1410,7 @@
%%DOCSDIR%%/html/linguist-trollprint-printpanel-cpp.html
%%DOCSDIR%%/html/linguist-trollprint-printpanel-h.html
%%DOCSDIR%%/html/linguist-trollprint.html
+%%DOCSDIR%%/html/linguist-ts-file-format.html
%%DOCSDIR%%/html/linguist.dcf
%%DOCSDIR%%/html/mac-differences.html
%%DOCSDIR%%/html/mainclasses.html
@@ -1510,7 +1639,6 @@
%%DOCSDIR%%/html/painting-painterpaths-window-cpp.html
%%DOCSDIR%%/html/painting-painterpaths-window-h.html
%%DOCSDIR%%/html/painting-painterpaths.html
-%%DOCSDIR%%/html/painting-separations.html
%%DOCSDIR%%/html/painting-svgviewer-main-cpp.html
%%DOCSDIR%%/html/painting-svgviewer-mainwindow-cpp.html
%%DOCSDIR%%/html/painting-svgviewer-mainwindow-h.html
@@ -1528,12 +1656,16 @@
%%DOCSDIR%%/html/painting-transformations.html
%%DOCSDIR%%/html/paintsystem.html
%%DOCSDIR%%/html/pdf-licensing.html
+%%DOCSDIR%%/html/platform-notes-mac.html
+%%DOCSDIR%%/html/platform-notes-windows.html
+%%DOCSDIR%%/html/platform-notes-x11.html
%%DOCSDIR%%/html/platform-notes.html
%%DOCSDIR%%/html/plugins-howto.html
%%DOCSDIR%%/html/plugins.html
%%DOCSDIR%%/html/porting.html
%%DOCSDIR%%/html/porting4-designer.html
%%DOCSDIR%%/html/porting4-dnd.html
+%%DOCSDIR%%/html/porting4-overview.html
%%DOCSDIR%%/html/porting4.html
%%DOCSDIR%%/html/printing.html
%%DOCSDIR%%/html/properties.html
@@ -1855,10 +1987,20 @@
%%DOCSDIR%%/html/qabstractextensionfactory.html
%%DOCSDIR%%/html/qabstractextensionmanager-members.html
%%DOCSDIR%%/html/qabstractextensionmanager.html
+%%DOCSDIR%%/html/qabstractfileengine-extensionoption.html
+%%DOCSDIR%%/html/qabstractfileengine-extensionreturn.html
%%DOCSDIR%%/html/qabstractfileengine-members.html
%%DOCSDIR%%/html/qabstractfileengine.html
%%DOCSDIR%%/html/qabstractfileenginehandler-members.html
%%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
@@ -1925,6 +2067,8 @@
%%DOCSDIR%%/html/qapplication.html
%%DOCSDIR%%/html/qassistantclient-members.html
%%DOCSDIR%%/html/qassistantclient.html
+%%DOCSDIR%%/html/qauthenticator-members.html
+%%DOCSDIR%%/html/qauthenticator.html
%%DOCSDIR%%/html/qaxaggregated-members.html
%%DOCSDIR%%/html/qaxaggregated.html
%%DOCSDIR%%/html/qaxbase-members.html
@@ -1978,6 +2122,7 @@
%%DOCSDIR%%/html/qcache-qt3.html
%%DOCSDIR%%/html/qcache.html
%%DOCSDIR%%/html/qcalendarwidget-members.html
+%%DOCSDIR%%/html/qcalendarwidget-obsolete.html
%%DOCSDIR%%/html/qcalendarwidget.html
%%DOCSDIR%%/html/qcdestyle-members.html
%%DOCSDIR%%/html/qcdestyle.html
@@ -1998,6 +2143,7 @@
%%DOCSDIR%%/html/qcloseevent-members.html
%%DOCSDIR%%/html/qcloseevent.html
%%DOCSDIR%%/html/qcolor-members.html
+%%DOCSDIR%%/html/qcolor-obsolete.html
%%DOCSDIR%%/html/qcolor-qt3.html
%%DOCSDIR%%/html/qcolor.html
%%DOCSDIR%%/html/qcolordialog-members.html
@@ -2008,6 +2154,8 @@
%%DOCSDIR%%/html/qcolorgroup.html
%%DOCSDIR%%/html/qcolormap-members.html
%%DOCSDIR%%/html/qcolormap.html
+%%DOCSDIR%%/html/qcolumnview-members.html
+%%DOCSDIR%%/html/qcolumnview.html
%%DOCSDIR%%/html/qcombobox-members.html
%%DOCSDIR%%/html/qcombobox-obsolete.html
%%DOCSDIR%%/html/qcombobox-qt3.html
@@ -2030,6 +2178,8 @@
%%DOCSDIR%%/html/qcoreapplication-members.html
%%DOCSDIR%%/html/qcoreapplication-qt3.html
%%DOCSDIR%%/html/qcoreapplication.html
+%%DOCSDIR%%/html/qcryptographichash-members.html
+%%DOCSDIR%%/html/qcryptographichash.html
%%DOCSDIR%%/html/qcursor-members.html
%%DOCSDIR%%/html/qcursor.html
%%DOCSDIR%%/html/qcustomevent-members.html
@@ -2065,6 +2215,8 @@
%%DOCSDIR%%/html/qdbusconnection.html
%%DOCSDIR%%/html/qdbusconnectioninterface-members.html
%%DOCSDIR%%/html/qdbusconnectioninterface.html
+%%DOCSDIR%%/html/qdbuscontext-members.html
+%%DOCSDIR%%/html/qdbuscontext.html
%%DOCSDIR%%/html/qdbusdeclaringsignals.html
%%DOCSDIR%%/html/qdbusdeclaringslots.html
%%DOCSDIR%%/html/qdbuserror-members.html
@@ -2084,6 +2236,7 @@
%%DOCSDIR%%/html/qdbustypesystem.html
%%DOCSDIR%%/html/qdbusvariant-members.html
%%DOCSDIR%%/html/qdbusvariant.html
+%%DOCSDIR%%/html/qdbusviewer.html
%%DOCSDIR%%/html/qdbusxml2cpp.html
%%DOCSDIR%%/html/qdecoration-members.html
%%DOCSDIR%%/html/qdecoration.html
@@ -2099,6 +2252,8 @@
%%DOCSDIR%%/html/qdesignercustomwidgetcollectioninterface.html
%%DOCSDIR%%/html/qdesignercustomwidgetinterface-members.html
%%DOCSDIR%%/html/qdesignercustomwidgetinterface.html
+%%DOCSDIR%%/html/qdesignerdynamicpropertysheetextension-members.html
+%%DOCSDIR%%/html/qdesignerdynamicpropertysheetextension.html
%%DOCSDIR%%/html/qdesignerformeditorinterface-members.html
%%DOCSDIR%%/html/qdesignerformeditorinterface.html
%%DOCSDIR%%/html/qdesignerformwindowcursorinterface-members.html
@@ -2139,6 +2294,8 @@
%%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
%%DOCSDIR%%/html/qdirmodel.html
%%DOCSDIR%%/html/qdockwidget-members.html
@@ -2183,6 +2340,7 @@
%%DOCSDIR%%/html/qdoublevalidator-qt3.html
%%DOCSDIR%%/html/qdoublevalidator.html
%%DOCSDIR%%/html/qdrag-members.html
+%%DOCSDIR%%/html/qdrag-obsolete.html
%%DOCSDIR%%/html/qdrag.html
%%DOCSDIR%%/html/qdragenterevent-members.html
%%DOCSDIR%%/html/qdragenterevent.html
@@ -2242,6 +2400,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
@@ -2284,6 +2446,7 @@
%%DOCSDIR%%/html/qgraphicsellipseitem-members.html
%%DOCSDIR%%/html/qgraphicsellipseitem.html
%%DOCSDIR%%/html/qgraphicsitem-members.html
+%%DOCSDIR%%/html/qgraphicsitem-obsolete.html
%%DOCSDIR%%/html/qgraphicsitem.html
%%DOCSDIR%%/html/qgraphicsitemanimation-members.html
%%DOCSDIR%%/html/qgraphicsitemanimation.html
@@ -2364,6 +2527,7 @@
%%DOCSDIR%%/html/qhttpresponseheader-members.html
%%DOCSDIR%%/html/qhttpresponseheader.html
%%DOCSDIR%%/html/qicon-members.html
+%%DOCSDIR%%/html/qicon-obsolete.html
%%DOCSDIR%%/html/qicon-qt3.html
%%DOCSDIR%%/html/qicon.html
%%DOCSDIR%%/html/qicondragevent-members.html
@@ -2372,6 +2536,10 @@
%%DOCSDIR%%/html/qiconengine.html
%%DOCSDIR%%/html/qiconengineplugin-members.html
%%DOCSDIR%%/html/qiconengineplugin.html
+%%DOCSDIR%%/html/qiconenginepluginv2-members.html
+%%DOCSDIR%%/html/qiconenginepluginv2.html
+%%DOCSDIR%%/html/qiconenginev2-members.html
+%%DOCSDIR%%/html/qiconenginev2.html
%%DOCSDIR%%/html/qimage-members.html
%%DOCSDIR%%/html/qimage-obsolete.html
%%DOCSDIR%%/html/qimage-qt3.html
@@ -2409,6 +2577,8 @@
%%DOCSDIR%%/html/qiodevice.html
%%DOCSDIR%%/html/qitemdelegate-members.html
%%DOCSDIR%%/html/qitemdelegate.html
+%%DOCSDIR%%/html/qitemeditorcreator-members.html
+%%DOCSDIR%%/html/qitemeditorcreator.html
%%DOCSDIR%%/html/qitemeditorcreatorbase-members.html
%%DOCSDIR%%/html/qitemeditorcreatorbase.html
%%DOCSDIR%%/html/qitemeditorfactory-members.html
@@ -2438,6 +2608,7 @@
%%DOCSDIR%%/html/qlatin1string-members.html
%%DOCSDIR%%/html/qlatin1string.html
%%DOCSDIR%%/html/qlayout-members.html
+%%DOCSDIR%%/html/qlayout-obsolete.html
%%DOCSDIR%%/html/qlayout-qt3.html
%%DOCSDIR%%/html/qlayout.html
%%DOCSDIR%%/html/qlayoutitem-members.html
@@ -2490,6 +2661,7 @@
%%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
@@ -2508,6 +2680,10 @@
%%DOCSDIR%%/html/qmatrix-members.html
%%DOCSDIR%%/html/qmatrix-qt3.html
%%DOCSDIR%%/html/qmatrix.html
+%%DOCSDIR%%/html/qmdiarea-members.html
+%%DOCSDIR%%/html/qmdiarea.html
+%%DOCSDIR%%/html/qmdisubwindow-members.html
+%%DOCSDIR%%/html/qmdisubwindow.html
%%DOCSDIR%%/html/qmenu-members.html
%%DOCSDIR%%/html/qmenu-qt3.html
%%DOCSDIR%%/html/qmenu.html
@@ -2627,6 +2803,7 @@
%%DOCSDIR%%/html/qpictureio-members.html
%%DOCSDIR%%/html/qpictureio.html
%%DOCSDIR%%/html/qpixmap-members.html
+%%DOCSDIR%%/html/qpixmap-obsolete.html
%%DOCSDIR%%/html/qpixmap-qt3.html
%%DOCSDIR%%/html/qpixmap.html
%%DOCSDIR%%/html/qpixmapcache-members.html
@@ -2699,6 +2876,7 @@
%%DOCSDIR%%/html/qresizeevent-members.html
%%DOCSDIR%%/html/qresizeevent.html
%%DOCSDIR%%/html/qresource-members.html
+%%DOCSDIR%%/html/qresource-obsolete.html
%%DOCSDIR%%/html/qresource.html
%%DOCSDIR%%/html/qrubberband-members.html
%%DOCSDIR%%/html/qrubberband.html
@@ -2710,6 +2888,18 @@
%%DOCSDIR%%/html/qscreendriverfactory.html
%%DOCSDIR%%/html/qscreendriverplugin-members.html
%%DOCSDIR%%/html/qscreendriverplugin.html
+%%DOCSDIR%%/html/qscriptable-members.html
+%%DOCSDIR%%/html/qscriptable.html
+%%DOCSDIR%%/html/qscriptcontext-members.html
+%%DOCSDIR%%/html/qscriptcontext.html
+%%DOCSDIR%%/html/qscriptengine-members.html
+%%DOCSDIR%%/html/qscriptengine.html
+%%DOCSDIR%%/html/qscriptextensionplugin-members.html
+%%DOCSDIR%%/html/qscriptextensionplugin.html
+%%DOCSDIR%%/html/qscriptvalue-members.html
+%%DOCSDIR%%/html/qscriptvalue.html
+%%DOCSDIR%%/html/qscriptvalueiterator-members.html
+%%DOCSDIR%%/html/qscriptvalueiterator.html
%%DOCSDIR%%/html/qscrollarea-members.html
%%DOCSDIR%%/html/qscrollarea.html
%%DOCSDIR%%/html/qscrollbar-members.html
@@ -2763,6 +2953,7 @@
%%DOCSDIR%%/html/qsocketnotifier-qt3.html
%%DOCSDIR%%/html/qsocketnotifier.html
%%DOCSDIR%%/html/qsortfilterproxymodel-members.html
+%%DOCSDIR%%/html/qsortfilterproxymodel-obsolete.html
%%DOCSDIR%%/html/qsortfilterproxymodel.html
%%DOCSDIR%%/html/qsound-members.html
%%DOCSDIR%%/html/qsound-qt3.html
@@ -2821,6 +3012,17 @@
%%DOCSDIR%%/html/qsqlresult.html
%%DOCSDIR%%/html/qsqltablemodel-members.html
%%DOCSDIR%%/html/qsqltablemodel.html
+%%DOCSDIR%%/html/qssl.html
+%%DOCSDIR%%/html/qsslcertificate-members.html
+%%DOCSDIR%%/html/qsslcertificate.html
+%%DOCSDIR%%/html/qsslcipher-members.html
+%%DOCSDIR%%/html/qsslcipher.html
+%%DOCSDIR%%/html/qsslerror-members.html
+%%DOCSDIR%%/html/qsslerror.html
+%%DOCSDIR%%/html/qsslkey-members.html
+%%DOCSDIR%%/html/qsslkey.html
+%%DOCSDIR%%/html/qsslsocket-members.html
+%%DOCSDIR%%/html/qsslsocket.html
%%DOCSDIR%%/html/qstack-members.html
%%DOCSDIR%%/html/qstack.html
%%DOCSDIR%%/html/qstackedlayout-members.html
@@ -2849,7 +3051,10 @@
%%DOCSDIR%%/html/qstringlistmodel.html
%%DOCSDIR%%/html/qstringmatcher-members.html
%%DOCSDIR%%/html/qstringmatcher.html
+%%DOCSDIR%%/html/qstringref-members.html
+%%DOCSDIR%%/html/qstringref.html
%%DOCSDIR%%/html/qstyle-members.html
+%%DOCSDIR%%/html/qstyle-obsolete.html
%%DOCSDIR%%/html/qstyle.html
%%DOCSDIR%%/html/qstylefactory-members.html
%%DOCSDIR%%/html/qstylefactory.html
@@ -2857,6 +3062,8 @@
%%DOCSDIR%%/html/qstylehintreturn.html
%%DOCSDIR%%/html/qstylehintreturnmask-members.html
%%DOCSDIR%%/html/qstylehintreturnmask.html
+%%DOCSDIR%%/html/qstylehintreturnvariant-members.html
+%%DOCSDIR%%/html/qstylehintreturnvariant.html
%%DOCSDIR%%/html/qstyleoption-members.html
%%DOCSDIR%%/html/qstyleoption-obsolete.html
%%DOCSDIR%%/html/qstyleoption.html
@@ -2914,6 +3121,8 @@
%%DOCSDIR%%/html/qstyleoptiontoolbar.html
%%DOCSDIR%%/html/qstyleoptiontoolbox-members.html
%%DOCSDIR%%/html/qstyleoptiontoolbox.html
+%%DOCSDIR%%/html/qstyleoptiontoolboxv2-members.html
+%%DOCSDIR%%/html/qstyleoptiontoolboxv2.html
%%DOCSDIR%%/html/qstyleoptiontoolbutton-members.html
%%DOCSDIR%%/html/qstyleoptiontoolbutton.html
%%DOCSDIR%%/html/qstyleoptionviewitem-members.html
@@ -2924,6 +3133,8 @@
%%DOCSDIR%%/html/qstylepainter.html
%%DOCSDIR%%/html/qstyleplugin-members.html
%%DOCSDIR%%/html/qstyleplugin.html
+%%DOCSDIR%%/html/qsvggenerator-members.html
+%%DOCSDIR%%/html/qsvggenerator.html
%%DOCSDIR%%/html/qsvgrenderer-members.html
%%DOCSDIR%%/html/qsvgrenderer.html
%%DOCSDIR%%/html/qsvgwidget-members.html
@@ -2943,7 +3154,7 @@
%%DOCSDIR%%/html/qt3support.html
%%DOCSDIR%%/html/qt3to4-treewalker.html
%%DOCSDIR%%/html/qt3to4.html
-%%DOCSDIR%%/html/qt4-2-intro.html
+%%DOCSDIR%%/html/qt4-3-intro.html
%%DOCSDIR%%/html/qt4-accessibility.html
%%DOCSDIR%%/html/qt4-arthur.html
%%DOCSDIR%%/html/qt4-designer.html
@@ -3014,6 +3225,7 @@
%%DOCSDIR%%/html/qtextbrowser-qt3.html
%%DOCSDIR%%/html/qtextbrowser.html
%%DOCSDIR%%/html/qtextcharformat-members.html
+%%DOCSDIR%%/html/qtextcharformat-obsolete.html
%%DOCSDIR%%/html/qtextcharformat.html
%%DOCSDIR%%/html/qtextcodec-converterstate-members.html
%%DOCSDIR%%/html/qtextcodec-converterstate.html
@@ -3116,6 +3328,12 @@
%%DOCSDIR%%/html/qtooltip.html
%%DOCSDIR%%/html/qtopengl.html
%%DOCSDIR%%/html/qtopiacore-accel.html
+%%DOCSDIR%%/html/qtopiacore-ahigl-qscreenahigl-qws-cpp.html
+%%DOCSDIR%%/html/qtopiacore-ahigl-qscreenahigl-qws-h.html
+%%DOCSDIR%%/html/qtopiacore-ahigl-qscreenahiglplugin-cpp.html
+%%DOCSDIR%%/html/qtopiacore-ahigl-qwindowsurface-ahigl-cpp.html
+%%DOCSDIR%%/html/qtopiacore-ahigl-qwindowsurface-ahigl-p-h.html
+%%DOCSDIR%%/html/qtopiacore-ahigl.html
%%DOCSDIR%%/html/qtopiacore-architecture.html
%%DOCSDIR%%/html/qtopiacore-charinput.html
%%DOCSDIR%%/html/qtopiacore-crosscompiling.html
@@ -3154,6 +3372,8 @@
%%DOCSDIR%%/html/qtopiacore-vnc.html
%%DOCSDIR%%/html/qtopiacore.html
%%DOCSDIR%%/html/qtplugin.html
+%%DOCSDIR%%/html/qtransform-members.html
+%%DOCSDIR%%/html/qtransform.html
%%DOCSDIR%%/html/qtranslator-members.html
%%DOCSDIR%%/html/qtranslator-qt3.html
%%DOCSDIR%%/html/qtranslator.html
@@ -3168,6 +3388,8 @@
%%DOCSDIR%%/html/qtreewidgetitem.html
%%DOCSDIR%%/html/qtreewidgetitemiterator-members.html
%%DOCSDIR%%/html/qtreewidgetitemiterator.html
+%%DOCSDIR%%/html/qtscript.html
+%%DOCSDIR%%/html/qtscriptextensions.html
%%DOCSDIR%%/html/qtsql.html
%%DOCSDIR%%/html/qtsvg.html
%%DOCSDIR%%/html/qttest.html
@@ -3210,6 +3432,8 @@
%%DOCSDIR%%/html/qvector.html
%%DOCSDIR%%/html/qvectoriterator-members.html
%%DOCSDIR%%/html/qvectoriterator.html
+%%DOCSDIR%%/html/qvncscreen-members.html
+%%DOCSDIR%%/html/qvncscreen.html
%%DOCSDIR%%/html/qwaitcondition-members.html
%%DOCSDIR%%/html/qwaitcondition.html
%%DOCSDIR%%/html/qwhatsthis-members.html
@@ -3234,8 +3458,14 @@
%%DOCSDIR%%/html/qwindowsstyle.html
%%DOCSDIR%%/html/qwindowstatechangeevent-members.html
%%DOCSDIR%%/html/qwindowstatechangeevent.html
+%%DOCSDIR%%/html/qwindowsvistastyle-members.html
+%%DOCSDIR%%/html/qwindowsvistastyle.html
%%DOCSDIR%%/html/qwindowsxpstyle-members.html
%%DOCSDIR%%/html/qwindowsxpstyle.html
+%%DOCSDIR%%/html/qwizard-members.html
+%%DOCSDIR%%/html/qwizard.html
+%%DOCSDIR%%/html/qwizardpage-members.html
+%%DOCSDIR%%/html/qwizardpage.html
%%DOCSDIR%%/html/qworkspace-members.html
%%DOCSDIR%%/html/qworkspace-qt3.html
%%DOCSDIR%%/html/qworkspace.html
@@ -3250,6 +3480,8 @@
%%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
@@ -3269,8 +3501,6 @@
%%DOCSDIR%%/html/qwsserver.html
%%DOCSDIR%%/html/qwswindow-members.html
%%DOCSDIR%%/html/qwswindow.html
-%%DOCSDIR%%/html/qwswindowsurface-members.html
-%%DOCSDIR%%/html/qwswindowsurface.html
%%DOCSDIR%%/html/qx11embedcontainer-members.html
%%DOCSDIR%%/html/qx11embedcontainer.html
%%DOCSDIR%%/html/qx11embedwidget-members.html
@@ -3307,6 +3537,20 @@
%%DOCSDIR%%/html/qxmlreader.html
%%DOCSDIR%%/html/qxmlsimplereader-members.html
%%DOCSDIR%%/html/qxmlsimplereader.html
+%%DOCSDIR%%/html/qxmlstreamattribute-members.html
+%%DOCSDIR%%/html/qxmlstreamattribute.html
+%%DOCSDIR%%/html/qxmlstreamattributes-members.html
+%%DOCSDIR%%/html/qxmlstreamattributes.html
+%%DOCSDIR%%/html/qxmlstreamentitydeclaration-members.html
+%%DOCSDIR%%/html/qxmlstreamentitydeclaration.html
+%%DOCSDIR%%/html/qxmlstreamnamespacedeclaration-members.html
+%%DOCSDIR%%/html/qxmlstreamnamespacedeclaration.html
+%%DOCSDIR%%/html/qxmlstreamnotationdeclaration-members.html
+%%DOCSDIR%%/html/qxmlstreamnotationdeclaration.html
+%%DOCSDIR%%/html/qxmlstreamreader-members.html
+%%DOCSDIR%%/html/qxmlstreamreader.html
+%%DOCSDIR%%/html/qxmlstreamwriter-members.html
+%%DOCSDIR%%/html/qxmlstreamwriter.html
%%DOCSDIR%%/html/rcc.html
%%DOCSDIR%%/html/resources.html
%%DOCSDIR%%/html/richtext-advanced-processing.html
@@ -3331,6 +3575,58 @@
%%DOCSDIR%%/html/richtext-syntaxhighlighter-mainwindow-h.html
%%DOCSDIR%%/html/richtext-syntaxhighlighter.html
%%DOCSDIR%%/html/richtext.html
+%%DOCSDIR%%/html/script-calculator-calculator-js.html
+%%DOCSDIR%%/html/script-calculator-calculator-qrc.html
+%%DOCSDIR%%/html/script-calculator-main-cpp.html
+%%DOCSDIR%%/html/script-calculator.html
+%%DOCSDIR%%/html/script-context2d-context2d-cpp.html
+%%DOCSDIR%%/html/script-context2d-context2d-h.html
+%%DOCSDIR%%/html/script-context2d-context2d-qrc.html
+%%DOCSDIR%%/html/script-context2d-domimage-cpp.html
+%%DOCSDIR%%/html/script-context2d-domimage-h.html
+%%DOCSDIR%%/html/script-context2d-main-cpp.html
+%%DOCSDIR%%/html/script-context2d-qcontext2dcanvas-cpp.html
+%%DOCSDIR%%/html/script-context2d-qcontext2dcanvas-h.html
+%%DOCSDIR%%/html/script-context2d-scripts-alpha-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-arc-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-bezier-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-clock-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-fill1-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-grad-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-linecap-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-linestye-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-moveto-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-moveto2-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-pacman-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-plasma-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-pong-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-quad-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-rgba-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-rotate-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-scale-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-stroke1-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-translate-js.html
+%%DOCSDIR%%/html/script-context2d-window-cpp.html
+%%DOCSDIR%%/html/script-context2d-window-h.html
+%%DOCSDIR%%/html/script-context2d.html
+%%DOCSDIR%%/html/script-defaultprototypes-code-js.html
+%%DOCSDIR%%/html/script-defaultprototypes-defaultprototypes-qrc.html
+%%DOCSDIR%%/html/script-defaultprototypes-main-cpp.html
+%%DOCSDIR%%/html/script-defaultprototypes-prototypes-cpp.html
+%%DOCSDIR%%/html/script-defaultprototypes-prototypes-h.html
+%%DOCSDIR%%/html/script-defaultprototypes.html
+%%DOCSDIR%%/html/script-helloscript-main-cpp.html
+%%DOCSDIR%%/html/script-helloscript.html
+%%DOCSDIR%%/html/script-tetrix-main-cpp.html
+%%DOCSDIR%%/html/script-tetrix-tetrix-qrc.html
+%%DOCSDIR%%/html/script-tetrix-tetrixboard-cpp.html
+%%DOCSDIR%%/html/script-tetrix-tetrixboard-h.html
+%%DOCSDIR%%/html/script-tetrix-tetrixboard-js.html
+%%DOCSDIR%%/html/script-tetrix-tetrixpiece-js.html
+%%DOCSDIR%%/html/script-tetrix-tetrixwindow-js.html
+%%DOCSDIR%%/html/script-tetrix.html
+%%DOCSDIR%%/html/script.html
+%%DOCSDIR%%/html/scripting.html
%%DOCSDIR%%/html/session.html
%%DOCSDIR%%/html/shared.html
%%DOCSDIR%%/html/signalsandslots.html
@@ -3338,7 +3634,24 @@
%%DOCSDIR%%/html/sql-cachedtable-tableeditor-cpp.html
%%DOCSDIR%%/html/sql-cachedtable-tableeditor-h.html
%%DOCSDIR%%/html/sql-cachedtable.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-informationwindow-cpp.html
+%%DOCSDIR%%/html/sql-drilldown-informationwindow-h.html
+%%DOCSDIR%%/html/sql-drilldown-main-cpp.html
+%%DOCSDIR%%/html/sql-drilldown-view-cpp.html
+%%DOCSDIR%%/html/sql-drilldown-view-h.html
+%%DOCSDIR%%/html/sql-drilldown.html
%%DOCSDIR%%/html/sql-driver.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-main-cpp.html
+%%DOCSDIR%%/html/sql-masterdetail-mainwindow-cpp.html
+%%DOCSDIR%%/html/sql-masterdetail-mainwindow-h.html
+%%DOCSDIR%%/html/sql-masterdetail-masterdetail-qrc.html
+%%DOCSDIR%%/html/sql-masterdetail.html
%%DOCSDIR%%/html/sql-querymodel-customsqlmodel-cpp.html
%%DOCSDIR%%/html/sql-querymodel-customsqlmodel-h.html
%%DOCSDIR%%/html/sql-querymodel-editablesqlmodel-cpp.html
@@ -3350,7 +3663,9 @@
%%DOCSDIR%%/html/sql-tablemodel-tablemodel-cpp.html
%%DOCSDIR%%/html/sql-tablemodel.html
%%DOCSDIR%%/html/stylesheet.html
+%%DOCSDIR%%/html/supported-platforms.html
%%DOCSDIR%%/html/templates.html
+%%DOCSDIR%%/html/text-processing.html
%%DOCSDIR%%/html/text.html
%%DOCSDIR%%/html/thread.html
%%DOCSDIR%%/html/threads-mandelbrot-main-cpp.html
@@ -3386,6 +3701,13 @@
%%DOCSDIR%%/html/tools-customcompleter-textedit-cpp.html
%%DOCSDIR%%/html/tools-customcompleter-textedit-h.html
%%DOCSDIR%%/html/tools-customcompleter.html
+%%DOCSDIR%%/html/tools-echoplugin-echowindow-echointerface-h.html
+%%DOCSDIR%%/html/tools-echoplugin-echowindow-echowindow-cpp.html
+%%DOCSDIR%%/html/tools-echoplugin-echowindow-echowindow-h.html
+%%DOCSDIR%%/html/tools-echoplugin-echowindow-main-cpp.html
+%%DOCSDIR%%/html/tools-echoplugin-plugin-echoplugin-cpp.html
+%%DOCSDIR%%/html/tools-echoplugin-plugin-echoplugin-h.html
+%%DOCSDIR%%/html/tools-echoplugin.html
%%DOCSDIR%%/html/tools-i18n-i18n-qrc.html
%%DOCSDIR%%/html/tools-i18n-languagechooser-cpp.html
%%DOCSDIR%%/html/tools-i18n-languagechooser-h.html
@@ -3408,15 +3730,6 @@
%%DOCSDIR%%/html/tools-plugandpaintplugins-extrafilters-extrafiltersplugin-cpp.html
%%DOCSDIR%%/html/tools-plugandpaintplugins-extrafilters-extrafiltersplugin-h.html
%%DOCSDIR%%/html/tools-plugandpaintplugins-extrafilters.html
-%%DOCSDIR%%/html/tools-qtdemo-displayshape-cpp.html
-%%DOCSDIR%%/html/tools-qtdemo-displayshape-h.html
-%%DOCSDIR%%/html/tools-qtdemo-displaywidget-cpp.html
-%%DOCSDIR%%/html/tools-qtdemo-displaywidget-h.html
-%%DOCSDIR%%/html/tools-qtdemo-launcher-cpp.html
-%%DOCSDIR%%/html/tools-qtdemo-launcher-h.html
-%%DOCSDIR%%/html/tools-qtdemo-main-cpp.html
-%%DOCSDIR%%/html/tools-qtdemo-qtdemo-qrc.html
-%%DOCSDIR%%/html/tools-qtdemo.html
%%DOCSDIR%%/html/tools-regexp-main-cpp.html
%%DOCSDIR%%/html/tools-regexp-regexpdialog-cpp.html
%%DOCSDIR%%/html/tools-regexp-regexpdialog-h.html
@@ -3431,6 +3744,32 @@
%%DOCSDIR%%/html/tools-settingseditor-variantdelegate-cpp.html
%%DOCSDIR%%/html/tools-settingseditor-variantdelegate-h.html
%%DOCSDIR%%/html/tools-settingseditor.html
+%%DOCSDIR%%/html/tools-styleplugin-plugin-simplestyle-cpp.html
+%%DOCSDIR%%/html/tools-styleplugin-plugin-simplestyle-h.html
+%%DOCSDIR%%/html/tools-styleplugin-plugin-simplestyleplugin-cpp.html
+%%DOCSDIR%%/html/tools-styleplugin-plugin-simplestyleplugin-h.html
+%%DOCSDIR%%/html/tools-styleplugin-stylewindow-main-cpp.html
+%%DOCSDIR%%/html/tools-styleplugin-stylewindow-stylewindow-cpp.html
+%%DOCSDIR%%/html/tools-styleplugin-stylewindow-stylewindow-h.html
+%%DOCSDIR%%/html/tools-styleplugin.html
+%%DOCSDIR%%/html/tools-treemodelcompleter-main-cpp.html
+%%DOCSDIR%%/html/tools-treemodelcompleter-mainwindow-cpp.html
+%%DOCSDIR%%/html/tools-treemodelcompleter-mainwindow-h.html
+%%DOCSDIR%%/html/tools-treemodelcompleter-treemodelcompleter-cpp.html
+%%DOCSDIR%%/html/tools-treemodelcompleter-treemodelcompleter-h.html
+%%DOCSDIR%%/html/tools-treemodelcompleter-treemodelcompleter-qrc.html
+%%DOCSDIR%%/html/tools-treemodelcompleter.html
+%%DOCSDIR%%/html/tools-undoframework-commands-cpp.html
+%%DOCSDIR%%/html/tools-undoframework-commands-h.html
+%%DOCSDIR%%/html/tools-undoframework-diagramitem-cpp.html
+%%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-main-cpp.html
+%%DOCSDIR%%/html/tools-undoframework-mainwindow-cpp.html
+%%DOCSDIR%%/html/tools-undoframework-mainwindow-h.html
+%%DOCSDIR%%/html/tools-undoframework-undoframework-qrc.html
+%%DOCSDIR%%/html/tools-undoframework.html
%%DOCSDIR%%/html/tools.html
%%DOCSDIR%%/html/topics.html
%%DOCSDIR%%/html/trademarks.html
@@ -3511,6 +3850,10 @@
%%DOCSDIR%%/html/widgets-calculator-calculator-h.html
%%DOCSDIR%%/html/widgets-calculator-main-cpp.html
%%DOCSDIR%%/html/widgets-calculator.html
+%%DOCSDIR%%/html/widgets-calendarwidget-main-cpp.html
+%%DOCSDIR%%/html/widgets-calendarwidget-window-cpp.html
+%%DOCSDIR%%/html/widgets-calendarwidget-window-h.html
+%%DOCSDIR%%/html/widgets-calendarwidget.html
%%DOCSDIR%%/html/widgets-charactermap-characterwidget-cpp.html
%%DOCSDIR%%/html/widgets-charactermap-characterwidget-h.html
%%DOCSDIR%%/html/widgets-charactermap-main-cpp.html
@@ -3582,6 +3925,14 @@
%%DOCSDIR%%/html/widgets-stylesheet-stylesheeteditor-cpp.html
%%DOCSDIR%%/html/widgets-stylesheet-stylesheeteditor-h.html
%%DOCSDIR%%/html/widgets-stylesheet.html
+%%DOCSDIR%%/html/widgets-tablet-main-cpp.html
+%%DOCSDIR%%/html/widgets-tablet-mainwindow-cpp.html
+%%DOCSDIR%%/html/widgets-tablet-mainwindow-h.html
+%%DOCSDIR%%/html/widgets-tablet-tabletapplication-cpp.html
+%%DOCSDIR%%/html/widgets-tablet-tabletapplication-h.html
+%%DOCSDIR%%/html/widgets-tablet-tabletcanvas-cpp.html
+%%DOCSDIR%%/html/widgets-tablet-tabletcanvas-h.html
+%%DOCSDIR%%/html/widgets-tablet.html
%%DOCSDIR%%/html/widgets-tetrix-main-cpp.html
%%DOCSDIR%%/html/widgets-tetrix-tetrixboard-cpp.html
%%DOCSDIR%%/html/widgets-tetrix-tetrixboard-h.html
@@ -3616,6 +3967,10 @@
%%DOCSDIR%%/html/xml-dombookmarks-xbeltree-cpp.html
%%DOCSDIR%%/html/xml-dombookmarks-xbeltree-h.html
%%DOCSDIR%%/html/xml-dombookmarks.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.html
%%DOCSDIR%%/html/xml-saxbookmarks-main-cpp.html
%%DOCSDIR%%/html/xml-saxbookmarks-mainwindow-cpp.html
%%DOCSDIR%%/html/xml-saxbookmarks-mainwindow-h.html
@@ -3624,7 +3979,17 @@
%%DOCSDIR%%/html/xml-saxbookmarks-xbelhandler-cpp.html
%%DOCSDIR%%/html/xml-saxbookmarks-xbelhandler-h.html
%%DOCSDIR%%/html/xml-saxbookmarks.html
+%%DOCSDIR%%/html/xml-streambookmarks-main-cpp.html
+%%DOCSDIR%%/html/xml-streambookmarks-mainwindow-cpp.html
+%%DOCSDIR%%/html/xml-streambookmarks-mainwindow-h.html
+%%DOCSDIR%%/html/xml-streambookmarks-xbelreader-cpp.html
+%%DOCSDIR%%/html/xml-streambookmarks-xbelreader-h.html
+%%DOCSDIR%%/html/xml-streambookmarks-xbelwriter-cpp.html
+%%DOCSDIR%%/html/xml-streambookmarks-xbelwriter-h.html
+%%DOCSDIR%%/html/xml-streambookmarks.html
%%DOCSDIR%%/html/xml-tools.html
+%%DOCSDIR%%/html/xml-xmlstreamlint-main-cpp.html
+%%DOCSDIR%%/html/xml-xmlstreamlint.html
@dirrm %%DOCSDIR%%/html/images
@dirrm %%DOCSDIR%%/html
@dirrm %%DOCSDIR%%
diff --git a/misc/qt4-qtconfig/Makefile b/misc/qt4-qtconfig/Makefile
index d09d18a66c1e..e54ca0676657 100644
--- a/misc/qt4-qtconfig/Makefile
+++ b/misc/qt4-qtconfig/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= qtconfig
-PORTVERSION= 4.2.3
-PORTREVISION= 2
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= misc
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,26 +18,13 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt graphical configuration utility
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4 \
- rcc:${PORTSDIR}/devel/qt4-rcc \
- uic-qt4:${PORTSDIR}/devel/qt4-uic
-LIB_DEPENDS= Qt3Support:${PORTSDIR}/devel/qt4-qt3support \
- QtCore:${PORTSDIR}/devel/qt4-corelib
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc rcc uic qt3support corelib
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/misc/qt4-qtconfig/distinfo b/misc/qt4-qtconfig/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/misc/qt4-qtconfig/distinfo
+++ b/misc/qt4-qtconfig/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/misc/qt4-qtdemo/Makefile b/misc/qt4-qtdemo/Makefile
index e88c8c031f26..b1452648e0a5 100644
--- a/misc/qt4-qtdemo/Makefile
+++ b/misc/qt4-qtdemo/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= qtdemo
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= misc
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,36 +18,14 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt demonstration and example programs
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4 \
- rcc:${PORTSDIR}/devel/qt4-rcc \
- uic-qt4:${PORTSDIR}/devel/qt4-uic
-LIB_DEPENDS= QtAssistantClient:${PORTSDIR}/devel/qt4-libqtassistantclient \
- QtCore:${PORTSDIR}/devel/qt4-corelib \
- QtDBus:${PORTSDIR}/devel/dbus-qt4 \
- QtDesigner:${PORTSDIR}/devel/qt4-designer \
- QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
- QtNetwork:${PORTSDIR}/net/qt4-network \
- QtOpenGL:${PORTSDIR}/x11/qt4-opengl \
- QtSql:${PORTSDIR}/databases/qt4-sql \
- QtSvg:${PORTSDIR}/graphics/qt4-svg \
- QtTest:${PORTSDIR}/devel/qt4-qtestlib \
- QtXml:${PORTSDIR}/textproc/qt4-xml
-RUN_DEPENDS= qt4-imageformats>=4.2.3:${PORTSDIR}/graphics/qt4-imageformats
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc rcc uic assistantclient corelib designer gui network opengl\
+ sql svg qtestlib xml imageformats dbus script
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/misc/qt4-qtdemo/distinfo b/misc/qt4-qtdemo/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/misc/qt4-qtdemo/distinfo
+++ b/misc/qt4-qtdemo/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/misc/qt4-qtdemo/pkg-plist b/misc/qt4-qtdemo/pkg-plist
index 7851ae7cf0c7..65e2f3cd80eb 100644
--- a/misc/qt4-qtdemo/pkg-plist
+++ b/misc/qt4-qtdemo/pkg-plist
@@ -73,14 +73,6 @@ share/qt4/demos/composition/composition.pro
share/qt4/demos/composition/composition.qrc
share/qt4/demos/composition/flower_2.png
share/qt4/demos/composition/main.cpp
-share/qt4/demos/dbus-viewer/dbus-viewer
-share/qt4/demos/dbus-viewer/dbus-viewer.debug
-share/qt4/demos/dbus-viewer/dbus-viewer.pro
-share/qt4/demos/dbus-viewer/main.cpp
-share/qt4/demos/dbus-viewer/qdbusmodel.cpp
-share/qt4/demos/dbus-viewer/qdbusmodel.h
-share/qt4/demos/dbus-viewer/qdbusviewer.cpp
-share/qt4/demos/dbus-viewer/qdbusviewer.h
share/qt4/demos/deform/deform
share/qt4/demos/deform/deform.debug
share/qt4/demos/deform/deform.pro
@@ -129,6 +121,56 @@ share/qt4/demos/pathstroke/pathstroke.h
share/qt4/demos/pathstroke/pathstroke.html
share/qt4/demos/pathstroke/pathstroke.pro
share/qt4/demos/pathstroke/pathstroke.qrc
+share/qt4/demos/qtdemo/colors.cpp
+share/qt4/demos/qtdemo/colors.h
+share/qt4/demos/qtdemo/demoitem.cpp
+share/qt4/demos/qtdemo/demoitem.h
+share/qt4/demos/qtdemo/demoitemanimation.cpp
+share/qt4/demos/qtdemo/demoitemanimation.h
+share/qt4/demos/qtdemo/demoscene.cpp
+share/qt4/demos/qtdemo/demoscene.h
+share/qt4/demos/qtdemo/demotextitem.cpp
+share/qt4/demos/qtdemo/demotextitem.h
+share/qt4/demos/qtdemo/dockitem.cpp
+share/qt4/demos/qtdemo/dockitem.h
+share/qt4/demos/qtdemo/examplecontent.cpp
+share/qt4/demos/qtdemo/examplecontent.h
+share/qt4/demos/qtdemo/guide.cpp
+share/qt4/demos/qtdemo/guide.h
+share/qt4/demos/qtdemo/guidecircle.cpp
+share/qt4/demos/qtdemo/guidecircle.h
+share/qt4/demos/qtdemo/guideline.cpp
+share/qt4/demos/qtdemo/guideline.h
+share/qt4/demos/qtdemo/headingitem.cpp
+share/qt4/demos/qtdemo/headingitem.h
+share/qt4/demos/qtdemo/imageitem.cpp
+share/qt4/demos/qtdemo/imageitem.h
+share/qt4/demos/qtdemo/images/demobg.png
+share/qt4/demos/qtdemo/images/qtlogo_small.png
+share/qt4/demos/qtdemo/images/trolltech-logo.png
+share/qt4/demos/qtdemo/itemcircleanimation.cpp
+share/qt4/demos/qtdemo/itemcircleanimation.h
+share/qt4/demos/qtdemo/letteritem.cpp
+share/qt4/demos/qtdemo/letteritem.h
+share/qt4/demos/qtdemo/main.cpp
+share/qt4/demos/qtdemo/mainwindow.cpp
+share/qt4/demos/qtdemo/mainwindow.h
+share/qt4/demos/qtdemo/menucontent.cpp
+share/qt4/demos/qtdemo/menucontent.h
+share/qt4/demos/qtdemo/menumanager.cpp
+share/qt4/demos/qtdemo/menumanager.h
+share/qt4/demos/qtdemo/qtdemo.icns
+share/qt4/demos/qtdemo/qtdemo.ico
+share/qt4/demos/qtdemo/qtdemo.pro
+share/qt4/demos/qtdemo/qtdemo.qrc
+share/qt4/demos/qtdemo/qtdemo.rc
+share/qt4/demos/qtdemo/scanitem.cpp
+share/qt4/demos/qtdemo/scanitem.h
+share/qt4/demos/qtdemo/score.cpp
+share/qt4/demos/qtdemo/score.h
+share/qt4/demos/qtdemo/textbutton.cpp
+share/qt4/demos/qtdemo/textbutton.h
+share/qt4/demos/qtdemo/xml/examples.xml
share/qt4/demos/shared/arthurstyle.cpp
share/qt4/demos/shared/arthurstyle.h
share/qt4/demos/shared/arthurwidgets.cpp
@@ -247,6 +289,17 @@ share/qt4/demos/textedit/textedit.doc
share/qt4/demos/textedit/textedit.h
share/qt4/demos/textedit/textedit.pro
share/qt4/demos/textedit/textedit.qrc
+share/qt4/demos/undo/commands.cpp
+share/qt4/demos/undo/commands.h
+share/qt4/demos/undo/document.cpp
+share/qt4/demos/undo/document.h
+share/qt4/demos/undo/main.cpp
+share/qt4/demos/undo/mainwindow.cpp
+share/qt4/demos/undo/mainwindow.h
+share/qt4/demos/undo/undo
+share/qt4/demos/undo/undo.debug
+share/qt4/demos/undo/undo.pro
+share/qt4/demos/undo/undo.qrc
share/qt4/examples/README
share/qt4/examples/assistant/assistant.pro
share/qt4/examples/assistant/simpletextviewer/documentation/about.txt
@@ -340,6 +393,12 @@ share/qt4/examples/desktop/systray/systray.qrc
share/qt4/examples/desktop/systray/window.cpp
share/qt4/examples/desktop/systray/window.h
share/qt4/examples/dialogs/README
+share/qt4/examples/dialogs/classwizard/classwizard
+share/qt4/examples/dialogs/classwizard/classwizard.cpp
+share/qt4/examples/dialogs/classwizard/classwizard.debug
+share/qt4/examples/dialogs/classwizard/classwizard.h
+share/qt4/examples/dialogs/classwizard/classwizard.pro
+share/qt4/examples/dialogs/classwizard/main.cpp
share/qt4/examples/dialogs/configdialog/configdialog
share/qt4/examples/dialogs/configdialog/configdialog.cpp
share/qt4/examples/dialogs/configdialog/configdialog.debug
@@ -365,6 +424,12 @@ share/qt4/examples/dialogs/findfiles/findfiles.pro
share/qt4/examples/dialogs/findfiles/main.cpp
share/qt4/examples/dialogs/findfiles/window.cpp
share/qt4/examples/dialogs/findfiles/window.h
+share/qt4/examples/dialogs/licensewizard/licensewizard
+share/qt4/examples/dialogs/licensewizard/licensewizard.cpp
+share/qt4/examples/dialogs/licensewizard/licensewizard.debug
+share/qt4/examples/dialogs/licensewizard/licensewizard.h
+share/qt4/examples/dialogs/licensewizard/licensewizard.pro
+share/qt4/examples/dialogs/licensewizard/main.cpp
share/qt4/examples/dialogs/standarddialogs/dialog.cpp
share/qt4/examples/dialogs/standarddialogs/dialog.h
share/qt4/examples/dialogs/standarddialogs/main.cpp
@@ -377,6 +442,10 @@ share/qt4/examples/dialogs/tabdialog/tabdialog.cpp
share/qt4/examples/dialogs/tabdialog/tabdialog.debug
share/qt4/examples/dialogs/tabdialog/tabdialog.h
share/qt4/examples/dialogs/tabdialog/tabdialog.pro
+share/qt4/examples/dialogs/trivialwizard/trivialwizard
+share/qt4/examples/dialogs/trivialwizard/trivialwizard.cpp
+share/qt4/examples/dialogs/trivialwizard/trivialwizard.debug
+share/qt4/examples/dialogs/trivialwizard/trivialwizard.pro
share/qt4/examples/draganddrop/README
share/qt4/examples/draganddrop/draganddrop.pro
share/qt4/examples/draganddrop/draggableicons/draggableicons
@@ -439,6 +508,36 @@ share/qt4/examples/graphicsview/collidingmice/main.cpp
share/qt4/examples/graphicsview/collidingmice/mice.qrc
share/qt4/examples/graphicsview/collidingmice/mouse.cpp
share/qt4/examples/graphicsview/collidingmice/mouse.h
+share/qt4/examples/graphicsview/diagramscene/arrow.cpp
+share/qt4/examples/graphicsview/diagramscene/arrow.h
+share/qt4/examples/graphicsview/diagramscene/diagramitem.cpp
+share/qt4/examples/graphicsview/diagramscene/diagramitem.h
+share/qt4/examples/graphicsview/diagramscene/diagramscene
+share/qt4/examples/graphicsview/diagramscene/diagramscene.cpp
+share/qt4/examples/graphicsview/diagramscene/diagramscene.debug
+share/qt4/examples/graphicsview/diagramscene/diagramscene.h
+share/qt4/examples/graphicsview/diagramscene/diagramscene.pro
+share/qt4/examples/graphicsview/diagramscene/diagramscene.qrc
+share/qt4/examples/graphicsview/diagramscene/diagramtextitem.cpp
+share/qt4/examples/graphicsview/diagramscene/diagramtextitem.h
+share/qt4/examples/graphicsview/diagramscene/images/background1.png
+share/qt4/examples/graphicsview/diagramscene/images/background2.png
+share/qt4/examples/graphicsview/diagramscene/images/background3.png
+share/qt4/examples/graphicsview/diagramscene/images/background4.png
+share/qt4/examples/graphicsview/diagramscene/images/bold.png
+share/qt4/examples/graphicsview/diagramscene/images/bringtofront.png
+share/qt4/examples/graphicsview/diagramscene/images/delete.png
+share/qt4/examples/graphicsview/diagramscene/images/floodfill.png
+share/qt4/examples/graphicsview/diagramscene/images/italic.png
+share/qt4/examples/graphicsview/diagramscene/images/linecolor.png
+share/qt4/examples/graphicsview/diagramscene/images/linepointer.png
+share/qt4/examples/graphicsview/diagramscene/images/pointer.png
+share/qt4/examples/graphicsview/diagramscene/images/sendtoback.png
+share/qt4/examples/graphicsview/diagramscene/images/textpointer.png
+share/qt4/examples/graphicsview/diagramscene/images/underline.png
+share/qt4/examples/graphicsview/diagramscene/main.cpp
+share/qt4/examples/graphicsview/diagramscene/mainwindow.cpp
+share/qt4/examples/graphicsview/diagramscene/mainwindow.h
share/qt4/examples/graphicsview/dragdroprobot/coloritem.cpp
share/qt4/examples/graphicsview/dragdroprobot/coloritem.h
share/qt4/examples/graphicsview/dragdroprobot/dragdroprobot
@@ -673,6 +772,14 @@ share/qt4/examples/itemviews/chart/mydata.cht
share/qt4/examples/itemviews/chart/pieview.cpp
share/qt4/examples/itemviews/chart/pieview.h
share/qt4/examples/itemviews/chart/qtdata.cht
+share/qt4/examples/itemviews/coloreditorfactory/coloreditorfactory
+share/qt4/examples/itemviews/coloreditorfactory/coloreditorfactory.debug
+share/qt4/examples/itemviews/coloreditorfactory/coloreditorfactory.pro
+share/qt4/examples/itemviews/coloreditorfactory/colorlisteditor.cpp
+share/qt4/examples/itemviews/coloreditorfactory/colorlisteditor.h
+share/qt4/examples/itemviews/coloreditorfactory/main.cpp
+share/qt4/examples/itemviews/coloreditorfactory/window.cpp
+share/qt4/examples/itemviews/coloreditorfactory/window.h
share/qt4/examples/itemviews/customsortfiltermodel/customsortfiltermodel
share/qt4/examples/itemviews/customsortfiltermodel/customsortfiltermodel.debug
share/qt4/examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro
@@ -730,12 +837,28 @@ share/qt4/examples/itemviews/simpletreemodel/treeitem.cpp
share/qt4/examples/itemviews/simpletreemodel/treeitem.h
share/qt4/examples/itemviews/simpletreemodel/treemodel.cpp
share/qt4/examples/itemviews/simpletreemodel/treemodel.h
+share/qt4/examples/itemviews/simplewidgetmapper/main.cpp
+share/qt4/examples/itemviews/simplewidgetmapper/simplewidgetmapper
+share/qt4/examples/itemviews/simplewidgetmapper/simplewidgetmapper.debug
+share/qt4/examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro
+share/qt4/examples/itemviews/simplewidgetmapper/window.cpp
+share/qt4/examples/itemviews/simplewidgetmapper/window.h
share/qt4/examples/itemviews/spinboxdelegate/delegate.cpp
share/qt4/examples/itemviews/spinboxdelegate/delegate.h
share/qt4/examples/itemviews/spinboxdelegate/main.cpp
share/qt4/examples/itemviews/spinboxdelegate/spinboxdelegate
share/qt4/examples/itemviews/spinboxdelegate/spinboxdelegate.debug
share/qt4/examples/itemviews/spinboxdelegate/spinboxdelegate.pro
+share/qt4/examples/itemviews/stardelegate/main.cpp
+share/qt4/examples/itemviews/stardelegate/stardelegate
+share/qt4/examples/itemviews/stardelegate/stardelegate.cpp
+share/qt4/examples/itemviews/stardelegate/stardelegate.debug
+share/qt4/examples/itemviews/stardelegate/stardelegate.h
+share/qt4/examples/itemviews/stardelegate/stardelegate.pro
+share/qt4/examples/itemviews/stardelegate/stareditor.cpp
+share/qt4/examples/itemviews/stardelegate/stareditor.h
+share/qt4/examples/itemviews/stardelegate/starrating.cpp
+share/qt4/examples/itemviews/stardelegate/starrating.h
share/qt4/examples/layouts/README
share/qt4/examples/layouts/basiclayouts/basiclayouts
share/qt4/examples/layouts/basiclayouts/basiclayouts.debug
@@ -913,6 +1036,7 @@ share/qt4/examples/network/ftp/images/cdtoparent.png
share/qt4/examples/network/ftp/images/dir.png
share/qt4/examples/network/ftp/images/file.png
share/qt4/examples/network/ftp/main.cpp
+share/qt4/examples/network/http/authenticationdialog.ui
share/qt4/examples/network/http/http
share/qt4/examples/network/http/http.debug
share/qt4/examples/network/http/http.pro
@@ -1246,6 +1370,68 @@ share/qt4/examples/richtext/syntaxhighlighter/mainwindow.h
share/qt4/examples/richtext/syntaxhighlighter/syntaxhighlighter
share/qt4/examples/richtext/syntaxhighlighter/syntaxhighlighter.debug
share/qt4/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro
+share/qt4/examples/script/README
+share/qt4/examples/script/calculator/calculator
+share/qt4/examples/script/calculator/calculator.debug
+share/qt4/examples/script/calculator/calculator.pro
+share/qt4/examples/script/calculator/calculator.qrc
+share/qt4/examples/script/calculator/main.cpp
+share/qt4/examples/script/context2d/context2d
+share/qt4/examples/script/context2d/context2d.cpp
+share/qt4/examples/script/context2d/context2d.debug
+share/qt4/examples/script/context2d/context2d.h
+share/qt4/examples/script/context2d/context2d.pro
+share/qt4/examples/script/context2d/context2d.qrc
+share/qt4/examples/script/context2d/domimage.cpp
+share/qt4/examples/script/context2d/domimage.h
+share/qt4/examples/script/context2d/main.cpp
+share/qt4/examples/script/context2d/qcontext2dcanvas.cpp
+share/qt4/examples/script/context2d/qcontext2dcanvas.h
+share/qt4/examples/script/context2d/scripts/alpha.js
+share/qt4/examples/script/context2d/scripts/arc.js
+share/qt4/examples/script/context2d/scripts/bezier.js
+share/qt4/examples/script/context2d/scripts/clock.js
+share/qt4/examples/script/context2d/scripts/fill1.js
+share/qt4/examples/script/context2d/scripts/grad.js
+share/qt4/examples/script/context2d/scripts/linecap.js
+share/qt4/examples/script/context2d/scripts/linestye.js
+share/qt4/examples/script/context2d/scripts/moveto.js
+share/qt4/examples/script/context2d/scripts/moveto2.js
+share/qt4/examples/script/context2d/scripts/pacman.js
+share/qt4/examples/script/context2d/scripts/plasma.js
+share/qt4/examples/script/context2d/scripts/pong.js
+share/qt4/examples/script/context2d/scripts/quad.js
+share/qt4/examples/script/context2d/scripts/rgba.js
+share/qt4/examples/script/context2d/scripts/rotate.js
+share/qt4/examples/script/context2d/scripts/scale.js
+share/qt4/examples/script/context2d/scripts/stroke1.js
+share/qt4/examples/script/context2d/scripts/translate.js
+share/qt4/examples/script/context2d/window.cpp
+share/qt4/examples/script/context2d/window.h
+share/qt4/examples/script/defaultprototypes/defaultprototypes
+share/qt4/examples/script/defaultprototypes/defaultprototypes.debug
+share/qt4/examples/script/defaultprototypes/defaultprototypes.pro
+share/qt4/examples/script/defaultprototypes/defaultprototypes.qrc
+share/qt4/examples/script/defaultprototypes/main.cpp
+share/qt4/examples/script/defaultprototypes/prototypes.cpp
+share/qt4/examples/script/defaultprototypes/prototypes.h
+share/qt4/examples/script/helloscript/helloscript
+share/qt4/examples/script/helloscript/helloscript.debug
+share/qt4/examples/script/helloscript/helloscript.pro
+share/qt4/examples/script/helloscript/main.cpp
+share/qt4/examples/script/qscript/main.cpp
+share/qt4/examples/script/qscript/qscript
+share/qt4/examples/script/qscript/qscript.debug
+share/qt4/examples/script/qscript/qscript.pro
+share/qt4/examples/script/script.pro
+share/qt4/examples/script/tetrix/main.cpp
+share/qt4/examples/script/tetrix/tetrix
+share/qt4/examples/script/tetrix/tetrix.debug
+share/qt4/examples/script/tetrix/tetrix.pro
+share/qt4/examples/script/tetrix/tetrix.qrc
+share/qt4/examples/script/tetrix/tetrixboard.cpp
+share/qt4/examples/script/tetrix/tetrixboard.h
+share/qt4/examples/script/tetrix/tetrixwindow.ui
share/qt4/examples/sql/README
share/qt4/examples/sql/cachedtable/cachedtable
share/qt4/examples/sql/cachedtable/cachedtable.debug
@@ -1254,6 +1440,27 @@ share/qt4/examples/sql/cachedtable/main.cpp
share/qt4/examples/sql/cachedtable/tableeditor.cpp
share/qt4/examples/sql/cachedtable/tableeditor.h
share/qt4/examples/sql/connection.h
+share/qt4/examples/sql/drilldown/drilldown
+share/qt4/examples/sql/drilldown/drilldown.debug
+share/qt4/examples/sql/drilldown/drilldown.pro
+share/qt4/examples/sql/drilldown/drilldown.qrc
+share/qt4/examples/sql/drilldown/imageitem.cpp
+share/qt4/examples/sql/drilldown/imageitem.h
+share/qt4/examples/sql/drilldown/informationwindow.cpp
+share/qt4/examples/sql/drilldown/informationwindow.h
+share/qt4/examples/sql/drilldown/main.cpp
+share/qt4/examples/sql/drilldown/view.cpp
+share/qt4/examples/sql/drilldown/view.h
+share/qt4/examples/sql/masterdetail/database.h
+share/qt4/examples/sql/masterdetail/dialog.cpp
+share/qt4/examples/sql/masterdetail/dialog.h
+share/qt4/examples/sql/masterdetail/main.cpp
+share/qt4/examples/sql/masterdetail/mainwindow.cpp
+share/qt4/examples/sql/masterdetail/mainwindow.h
+share/qt4/examples/sql/masterdetail/masterdetail
+share/qt4/examples/sql/masterdetail/masterdetail.debug
+share/qt4/examples/sql/masterdetail/masterdetail.pro
+share/qt4/examples/sql/masterdetail/masterdetail.qrc
share/qt4/examples/sql/querymodel/customsqlmodel.cpp
share/qt4/examples/sql/querymodel/customsqlmodel.h
share/qt4/examples/sql/querymodel/editablesqlmodel.cpp
@@ -1325,6 +1532,18 @@ share/qt4/examples/tools/customcompleter/mainwindow.h
share/qt4/examples/tools/customcompleter/resources/wordlist.txt
share/qt4/examples/tools/customcompleter/textedit.cpp
share/qt4/examples/tools/customcompleter/textedit.h
+share/qt4/examples/tools/echoplugin/echoplugin.pro
+share/qt4/examples/tools/echoplugin/echowindow/echointerface.h
+share/qt4/examples/tools/echoplugin/echowindow/echoplugin
+share/qt4/examples/tools/echoplugin/echowindow/echowindow.cpp
+share/qt4/examples/tools/echoplugin/echowindow/echowindow.h
+share/qt4/examples/tools/echoplugin/echowindow/echowindow.pro
+share/qt4/examples/tools/echoplugin/echowindow/main.cpp
+share/qt4/examples/tools/echoplugin/plugin/echoplugin.cpp
+share/qt4/examples/tools/echoplugin/plugin/echoplugin.h
+share/qt4/examples/tools/echoplugin/plugin/libechoplugin.so
+share/qt4/examples/tools/echoplugin/plugin/libechoplugin.so.debug
+share/qt4/examples/tools/echoplugin/plugin/plugin.pro
share/qt4/examples/tools/i18n/i18n
share/qt4/examples/tools/i18n/i18n.debug
share/qt4/examples/tools/i18n/i18n.pro
@@ -1383,22 +1602,6 @@ share/qt4/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro
share/qt4/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp
share/qt4/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h
share/qt4/examples/tools/plugandpaintplugins/plugandpaintplugins.pro
-share/qt4/examples/tools/qtdemo/demos.xml
-share/qt4/examples/tools/qtdemo/displayshape.cpp
-share/qt4/examples/tools/qtdemo/displayshape.h
-share/qt4/examples/tools/qtdemo/displaywidget.cpp
-share/qt4/examples/tools/qtdemo/displaywidget.h
-share/qt4/examples/tools/qtdemo/examples.xml
-share/qt4/examples/tools/qtdemo/images/qt4-logo.png
-share/qt4/examples/tools/qtdemo/images/trolltech-logo.png
-share/qt4/examples/tools/qtdemo/launcher.cpp
-share/qt4/examples/tools/qtdemo/launcher.h
-share/qt4/examples/tools/qtdemo/main.cpp
-share/qt4/examples/tools/qtdemo/qtdemo.icns
-share/qt4/examples/tools/qtdemo/qtdemo.ico
-share/qt4/examples/tools/qtdemo/qtdemo.pro
-share/qt4/examples/tools/qtdemo/qtdemo.qrc
-share/qt4/examples/tools/qtdemo/qtdemo.rc
share/qt4/examples/tools/regexp/main.cpp
share/qt4/examples/tools/regexp/regexp
share/qt4/examples/tools/regexp/regexp.debug
@@ -1419,7 +1622,43 @@ share/qt4/examples/tools/settingseditor/settingstree.cpp
share/qt4/examples/tools/settingseditor/settingstree.h
share/qt4/examples/tools/settingseditor/variantdelegate.cpp
share/qt4/examples/tools/settingseditor/variantdelegate.h
+share/qt4/examples/tools/styleplugin/plugin/plugin.pro
+share/qt4/examples/tools/styleplugin/plugin/simplestyle.cpp
+share/qt4/examples/tools/styleplugin/plugin/simplestyle.h
+share/qt4/examples/tools/styleplugin/plugin/simplestyleplugin.cpp
+share/qt4/examples/tools/styleplugin/plugin/simplestyleplugin.h
+share/qt4/examples/tools/styleplugin/styleplugin.pro
+share/qt4/examples/tools/styleplugin/stylewindow/main.cpp
+share/qt4/examples/tools/styleplugin/stylewindow/styleplugin
+share/qt4/examples/tools/styleplugin/stylewindow/styles/libsimplestyleplugin.so
+share/qt4/examples/tools/styleplugin/stylewindow/styles/libsimplestyleplugin.so.debug
+share/qt4/examples/tools/styleplugin/stylewindow/stylewindow.cpp
+share/qt4/examples/tools/styleplugin/stylewindow/stylewindow.h
+share/qt4/examples/tools/styleplugin/stylewindow/stylewindow.pro
share/qt4/examples/tools/tools.pro
+share/qt4/examples/tools/treemodelcompleter/main.cpp
+share/qt4/examples/tools/treemodelcompleter/mainwindow.cpp
+share/qt4/examples/tools/treemodelcompleter/mainwindow.h
+share/qt4/examples/tools/treemodelcompleter/resources/treemodel.txt
+share/qt4/examples/tools/treemodelcompleter/treemodelcompleter
+share/qt4/examples/tools/treemodelcompleter/treemodelcompleter.cpp
+share/qt4/examples/tools/treemodelcompleter/treemodelcompleter.debug
+share/qt4/examples/tools/treemodelcompleter/treemodelcompleter.h
+share/qt4/examples/tools/treemodelcompleter/treemodelcompleter.pro
+share/qt4/examples/tools/treemodelcompleter/treemodelcompleter.qrc
+share/qt4/examples/tools/undoframework/commands.cpp
+share/qt4/examples/tools/undoframework/commands.h
+share/qt4/examples/tools/undoframework/diagramitem.cpp
+share/qt4/examples/tools/undoframework/diagramitem.h
+share/qt4/examples/tools/undoframework/diagramscene.cpp
+share/qt4/examples/tools/undoframework/diagramscene.h
+share/qt4/examples/tools/undoframework/main.cpp
+share/qt4/examples/tools/undoframework/mainwindow.cpp
+share/qt4/examples/tools/undoframework/mainwindow.h
+share/qt4/examples/tools/undoframework/undoframework
+share/qt4/examples/tools/undoframework/undoframework.debug
+share/qt4/examples/tools/undoframework/undoframework.pro
+share/qt4/examples/tools/undoframework/undoframework.qrc
share/qt4/examples/tutorial/README
share/qt4/examples/tutorial/t1/main.cpp
share/qt4/examples/tutorial/t1/t1
@@ -1648,6 +1887,16 @@ share/qt4/examples/widgets/stylesheet/stylesheet.qrc
share/qt4/examples/widgets/stylesheet/stylesheeteditor.cpp
share/qt4/examples/widgets/stylesheet/stylesheeteditor.h
share/qt4/examples/widgets/stylesheet/stylesheeteditor.ui
+share/qt4/examples/widgets/tablet/main.cpp
+share/qt4/examples/widgets/tablet/mainwindow.cpp
+share/qt4/examples/widgets/tablet/mainwindow.h
+share/qt4/examples/widgets/tablet/tablet
+share/qt4/examples/widgets/tablet/tablet.debug
+share/qt4/examples/widgets/tablet/tablet.pro
+share/qt4/examples/widgets/tablet/tabletapplication.cpp
+share/qt4/examples/widgets/tablet/tabletapplication.h
+share/qt4/examples/widgets/tablet/tabletcanvas.cpp
+share/qt4/examples/widgets/tablet/tabletcanvas.h
share/qt4/examples/widgets/tetrix/main.cpp
share/qt4/examples/widgets/tetrix/tetrix
share/qt4/examples/widgets/tetrix/tetrix.debug
@@ -1698,6 +1947,12 @@ share/qt4/examples/xml/dombookmarks/mainwindow.cpp
share/qt4/examples/xml/dombookmarks/mainwindow.h
share/qt4/examples/xml/dombookmarks/xbeltree.cpp
share/qt4/examples/xml/dombookmarks/xbeltree.h
+share/qt4/examples/xml/rsslisting/main.cpp
+share/qt4/examples/xml/rsslisting/rsslisting
+share/qt4/examples/xml/rsslisting/rsslisting.cpp
+share/qt4/examples/xml/rsslisting/rsslisting.debug
+share/qt4/examples/xml/rsslisting/rsslisting.h
+share/qt4/examples/xml/rsslisting/rsslisting.pro
share/qt4/examples/xml/saxbookmarks/frank.xbel
share/qt4/examples/xml/saxbookmarks/jennifer.xbel
share/qt4/examples/xml/saxbookmarks/main.cpp
@@ -1710,8 +1965,27 @@ share/qt4/examples/xml/saxbookmarks/xbelgenerator.cpp
share/qt4/examples/xml/saxbookmarks/xbelgenerator.h
share/qt4/examples/xml/saxbookmarks/xbelhandler.cpp
share/qt4/examples/xml/saxbookmarks/xbelhandler.h
+share/qt4/examples/xml/streambookmarks/frank.xbel
+share/qt4/examples/xml/streambookmarks/jennifer.xbel
+share/qt4/examples/xml/streambookmarks/main.cpp
+share/qt4/examples/xml/streambookmarks/mainwindow.cpp
+share/qt4/examples/xml/streambookmarks/mainwindow.h
+share/qt4/examples/xml/streambookmarks/streambookmarks
+share/qt4/examples/xml/streambookmarks/streambookmarks.debug
+share/qt4/examples/xml/streambookmarks/streambookmarks.pro
+share/qt4/examples/xml/streambookmarks/xbelreader.cpp
+share/qt4/examples/xml/streambookmarks/xbelreader.h
+share/qt4/examples/xml/streambookmarks/xbelwriter.cpp
+share/qt4/examples/xml/streambookmarks/xbelwriter.h
share/qt4/examples/xml/xml.pro
+share/qt4/examples/xml/xmlstreamlint/main.cpp
+share/qt4/examples/xml/xmlstreamlint/xmlstreamlint
+share/qt4/examples/xml/xmlstreamlint/xmlstreamlint.debug
+share/qt4/examples/xml/xmlstreamlint/xmlstreamlint.pro
+@dirrm share/qt4/examples/xml/xmlstreamlint
+@dirrm share/qt4/examples/xml/streambookmarks
@dirrm share/qt4/examples/xml/saxbookmarks
+@dirrm share/qt4/examples/xml/rsslisting
@dirrm share/qt4/examples/xml/dombookmarks
@dirrm share/qt4/examples/xml
@dirrm share/qt4/examples/widgets/windowflags
@@ -1719,6 +1993,7 @@ share/qt4/examples/xml/xml.pro
@dirrm share/qt4/examples/widgets/tooltips/images
@dirrm share/qt4/examples/widgets/tooltips
@dirrm share/qt4/examples/widgets/tetrix
+@dirrm share/qt4/examples/widgets/tablet
@dirrm share/qt4/examples/widgets/stylesheet
@dirrm share/qt4/examples/widgets/styles/images
@dirrm share/qt4/examples/widgets/styles
@@ -1754,11 +2029,16 @@ share/qt4/examples/xml/xml.pro
@dirrm share/qt4/examples/tutorial/t10
@dirrm share/qt4/examples/tutorial/t1
@dirrm share/qt4/examples/tutorial
+@dirrm share/qt4/examples/tools/undoframework
+@dirrm share/qt4/examples/tools/treemodelcompleter/resources
+@dirrm share/qt4/examples/tools/treemodelcompleter
+@dirrm share/qt4/examples/tools/styleplugin/stylewindow/styles
+@dirrm share/qt4/examples/tools/styleplugin/stylewindow
+@dirrm share/qt4/examples/tools/styleplugin/plugin
+@dirrm share/qt4/examples/tools/styleplugin
@dirrm share/qt4/examples/tools/settingseditor/inifiles
@dirrm share/qt4/examples/tools/settingseditor
@dirrm share/qt4/examples/tools/regexp
-@dirrm share/qt4/examples/tools/qtdemo/images
-@dirrm share/qt4/examples/tools/qtdemo
@dirrm share/qt4/examples/tools/plugandpaintplugins/extrafilters
@dirrm share/qt4/examples/tools/plugandpaintplugins/basictools
@dirrm share/qt4/examples/tools/plugandpaintplugins
@@ -1766,6 +2046,9 @@ share/qt4/examples/xml/xml.pro
@dirrm share/qt4/examples/tools/plugandpaint
@dirrm share/qt4/examples/tools/i18n/translations
@dirrm share/qt4/examples/tools/i18n
+@dirrm share/qt4/examples/tools/echoplugin/plugin
+@dirrm share/qt4/examples/tools/echoplugin/echowindow
+@dirrm share/qt4/examples/tools/echoplugin
@dirrm share/qt4/examples/tools/customcompleter/resources
@dirrm share/qt4/examples/tools/customcompleter
@dirrm share/qt4/examples/tools/completer/resources
@@ -1780,8 +2063,18 @@ share/qt4/examples/xml/xml.pro
@dirrm share/qt4/examples/sql/tablemodel
@dirrm share/qt4/examples/sql/relationaltablemodel
@dirrm share/qt4/examples/sql/querymodel
+@dirrm share/qt4/examples/sql/masterdetail
+@dirrm share/qt4/examples/sql/drilldown
@dirrm share/qt4/examples/sql/cachedtable
@dirrm share/qt4/examples/sql
+@dirrm share/qt4/examples/script/tetrix
+@dirrm share/qt4/examples/script/qscript
+@dirrm share/qt4/examples/script/helloscript
+@dirrm share/qt4/examples/script/defaultprototypes
+@dirrm share/qt4/examples/script/context2d/scripts
+@dirrm share/qt4/examples/script/context2d
+@dirrm share/qt4/examples/script/calculator
+@dirrm share/qt4/examples/script
@dirrm share/qt4/examples/richtext/syntaxhighlighter
@dirrm share/qt4/examples/richtext/orderform
@dirrm share/qt4/examples/richtext/calendar
@@ -1858,7 +2151,9 @@ share/qt4/examples/xml/xml.pro
@dirrm share/qt4/examples/layouts/borderlayout
@dirrm share/qt4/examples/layouts/basiclayouts
@dirrm share/qt4/examples/layouts
+@dirrm share/qt4/examples/itemviews/stardelegate
@dirrm share/qt4/examples/itemviews/spinboxdelegate
+@dirrm share/qt4/examples/itemviews/simplewidgetmapper
@dirrm share/qt4/examples/itemviews/simpletreemodel
@dirrm share/qt4/examples/itemviews/simpledommodel
@dirrm share/qt4/examples/itemviews/puzzle
@@ -1866,6 +2161,7 @@ share/qt4/examples/xml/xml.pro
@dirrm share/qt4/examples/itemviews/pixelator
@dirrm share/qt4/examples/itemviews/dirview
@dirrm share/qt4/examples/itemviews/customsortfiltermodel
+@dirrm share/qt4/examples/itemviews/coloreditorfactory
@dirrm share/qt4/examples/itemviews/chart
@dirrm share/qt4/examples/itemviews/basicsortfiltermodel
@dirrm share/qt4/examples/itemviews
@@ -1885,6 +2181,8 @@ share/qt4/examples/xml/xml.pro
@dirrm share/qt4/examples/graphicsview/elasticnodes
@dirrm share/qt4/examples/graphicsview/dragdroprobot/images
@dirrm share/qt4/examples/graphicsview/dragdroprobot
+@dirrm share/qt4/examples/graphicsview/diagramscene/images
+@dirrm share/qt4/examples/graphicsview/diagramscene
@dirrm share/qt4/examples/graphicsview/collidingmice/images
@dirrm share/qt4/examples/graphicsview/collidingmice
@dirrm share/qt4/examples/graphicsview
@@ -1895,12 +2193,15 @@ share/qt4/examples/xml/xml.pro
@dirrm share/qt4/examples/draganddrop/draggableicons/images
@dirrm share/qt4/examples/draganddrop/draggableicons
@dirrm share/qt4/examples/draganddrop
+@dirrm share/qt4/examples/dialogs/trivialwizard
@dirrm share/qt4/examples/dialogs/tabdialog
@dirrm share/qt4/examples/dialogs/standarddialogs
+@dirrm share/qt4/examples/dialogs/licensewizard
@dirrm share/qt4/examples/dialogs/findfiles
@dirrm share/qt4/examples/dialogs/extension
@dirrm share/qt4/examples/dialogs/configdialog/images
@dirrm share/qt4/examples/dialogs/configdialog
+@dirrm share/qt4/examples/dialogs/classwizard
@dirrm share/qt4/examples/dialogs
@dirrm share/qt4/examples/desktop/systray
@dirrm share/qt4/examples/desktop/screenshot
@@ -1918,6 +2219,7 @@ share/qt4/examples/xml/xml.pro
@dirrm share/qt4/examples/assistant/simpletextviewer
@dirrm share/qt4/examples/assistant
@dirrm share/qt4/examples
+@dirrm share/qt4/demos/undo
@dirrm share/qt4/demos/textedit/images/win
@dirrm share/qt4/demos/textedit/images/mac
@dirrm share/qt4/demos/textedit/images
@@ -1927,13 +2229,15 @@ share/qt4/examples/xml/xml.pro
@dirrm share/qt4/demos/spreadsheet
@dirrm share/qt4/demos/shared/images
@dirrm share/qt4/demos/shared
+@dirrm share/qt4/demos/qtdemo/xml
+@dirrm share/qt4/demos/qtdemo/images
+@dirrm share/qt4/demos/qtdemo
@dirrm share/qt4/demos/pathstroke
@dirrm share/qt4/demos/mainwindow
@dirrm share/qt4/demos/interview/images
@dirrm share/qt4/demos/interview
@dirrm share/qt4/demos/gradients
@dirrm share/qt4/demos/deform
-@dirrm share/qt4/demos/dbus-viewer
@dirrm share/qt4/demos/composition
@dirrm share/qt4/demos/chip
@dirrm share/qt4/demos/books/images
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index d12472f7494e..09267b8c6727 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -167,7 +167,6 @@ DEFAULT_CDROM_DEVICE=/dev/acd0
.if !defined(WITHOUT_QT4)
USE_QT_VER+= 4
QT_COMPONENTS+= gui corelib moc rcc uic
-.include "${PORTSDIR}/Mk/bsd.kde.mk"
CONFIGURE_ARGS+=--enable-qt4
.else
CONFIGURE_ARGS+=--disable-qt4
diff --git a/net/qt4-network/Makefile b/net/qt4-network/Makefile
index 585bc27a69b3..6716b5e7e01d 100644
--- a/net/qt4-network/Makefile
+++ b/net/qt4-network/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= network
-PORTVERSION= 4.2.3
-PORTREVISION= 2
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= net ipv6
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,23 +18,14 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt network library
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4
-LIB_DEPENDS?= QtCore:${PORTSDIR}/devel/qt4-corelib
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc rcc corelib
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
-
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
+USE_OPENSSL= yes
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
@@ -46,7 +37,7 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
--exclude '${DISTNAME}/src/gui' --exclude '${DISTNAME}/src/xml' \
--exclude '${DISTNAME}/src/opengl' --exclude '${DISTNAME}/src/qt3support' \
--exclude '${DISTNAME}/src/sql' --exclude '${DISTNAME}/src/plugins' \
- --exclude '${DISTNAME}/src/3rdparty' --exclude '${DISTNAME}/src/tools/moc' \
+ --exclude '${DISTNAME}/src/tools/moc' \
--exclude '${DISTNAME}/src/tools/rcc' --exclude '${DISTNAME}/src/tools/uic3' \
--exclude '${DISTNAME}/tools/assistant' --exclude '${DISTNAME}/tools/designer' \
--exclude '${DISTNAME}/tools/linguist' --exclude '${DISTNAME}/tools/porting' \
@@ -65,13 +56,14 @@ 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/rcc ${WRKSRC}/../../bin/rcc
post-configure:
- ${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtNetwork.pc|${PREFIX}/libdata/pkgconfig/QtNetwork.pc|g' \
+ ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-e 's|.*$$(QMAKE).*||g' ${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/*Qt*
+ ${WRKSRC}/../../lib/pkgconfig/*Qt*
.include <bsd.port.post.mk>
diff --git a/net/qt4-network/distinfo b/net/qt4-network/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/net/qt4-network/distinfo
+++ b/net/qt4-network/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/net/qt4-network/pkg-plist b/net/qt4-network/pkg-plist
index eeff48a8d84c..73b29023804a 100644
--- a/net/qt4-network/pkg-plist
+++ b/net/qt4-network/pkg-plist
@@ -1,16 +1,24 @@
include/Qt/QtNetwork
include/Qt/qabstractsocket.h
+include/Qt/qauthenticator.h
include/Qt/qftp.h
include/Qt/qhostaddress.h
include/Qt/qhostinfo.h
include/Qt/qhttp.h
include/Qt/qnetworkinterface.h
include/Qt/qnetworkproxy.h
+include/Qt/qssl.h
+include/Qt/qsslcertificate.h
+include/Qt/qsslcipher.h
+include/Qt/qsslerror.h
+include/Qt/qsslkey.h
+include/Qt/qsslsocket.h
include/Qt/qtcpserver.h
include/Qt/qtcpsocket.h
include/Qt/qudpsocket.h
include/Qt/qurlinfo.h
include/QtNetwork/QAbstractSocket
+include/QtNetwork/QAuthenticator
include/QtNetwork/QFtp
include/QtNetwork/QHostAddress
include/QtNetwork/QHostInfo
@@ -22,6 +30,11 @@ include/QtNetwork/QIPv6Address
include/QtNetwork/QNetworkAddressEntry
include/QtNetwork/QNetworkInterface
include/QtNetwork/QNetworkProxy
+include/QtNetwork/QSslCertificate
+include/QtNetwork/QSslCipher
+include/QtNetwork/QSslError
+include/QtNetwork/QSslKey
+include/QtNetwork/QSslSocket
include/QtNetwork/QTcpServer
include/QtNetwork/QTcpSocket
include/QtNetwork/QUdpSocket
@@ -29,12 +42,19 @@ include/QtNetwork/QUrlInfo
include/QtNetwork/Q_IPV6ADDR
include/QtNetwork/QtNetwork
include/QtNetwork/qabstractsocket.h
+include/QtNetwork/qauthenticator.h
include/QtNetwork/qftp.h
include/QtNetwork/qhostaddress.h
include/QtNetwork/qhostinfo.h
include/QtNetwork/qhttp.h
include/QtNetwork/qnetworkinterface.h
include/QtNetwork/qnetworkproxy.h
+include/QtNetwork/qssl.h
+include/QtNetwork/qsslcertificate.h
+include/QtNetwork/qsslcipher.h
+include/QtNetwork/qsslerror.h
+include/QtNetwork/qsslkey.h
+include/QtNetwork/qsslsocket.h
include/QtNetwork/qtcpserver.h
include/QtNetwork/qtcpsocket.h
include/QtNetwork/qudpsocket.h
@@ -43,8 +63,8 @@ lib/libQtNetwork.la
lib/libQtNetwork.prl
lib/libQtNetwork.so
lib/libQtNetwork.so.4
-lib/libQtNetwork.so.4.2
-lib/libQtNetwork.so.4.2.3
-lib/libQtNetwork.so.4.2.3.debug
+lib/libQtNetwork.so.4.3
+lib/libQtNetwork.so.4.3.0
+lib/libQtNetwork.so.4.3.0.debug
libdata/pkgconfig/QtNetwork.pc
@dirrm include/QtNetwork
diff --git a/textproc/qt4-xml/Makefile b/textproc/qt4-xml/Makefile
index 9ec5d8787fed..9aacf23f96c7 100644
--- a/textproc/qt4-xml/Makefile
+++ b/textproc/qt4-xml/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= xml
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= textproc
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,24 +18,14 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt XML library
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4
-LIB_DEPENDS?= QtCore:${PORTSDIR}/devel/qt4-corelib
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc corelib
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
@@ -68,11 +58,11 @@ pre-configure:
${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc
post-configure:
- ${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtXml.pc|${PREFIX}/libdata/pkgconfig/QtXml.pc|g' \
- ${WRKSRC}/Makefile
+ ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+ -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${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/*Qt*
+ ${WRKSRC}/../../lib/pkgconfig/*Qt*
.include <bsd.port.post.mk>
diff --git a/textproc/qt4-xml/distinfo b/textproc/qt4-xml/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/textproc/qt4-xml/distinfo
+++ b/textproc/qt4-xml/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/textproc/qt4-xml/pkg-plist b/textproc/qt4-xml/pkg-plist
index fed99dfb67ed..1bdf9f64b59c 100644
--- a/textproc/qt4-xml/pkg-plist
+++ b/textproc/qt4-xml/pkg-plist
@@ -1,6 +1,7 @@
include/Qt/QtXml
include/Qt/qdom.h
include/Qt/qxml.h
+include/Qt/qxmlstream.h
include/QtXml/QDomAttr
include/QtXml/QDomCDATASection
include/QtXml/QDomCharacterData
@@ -32,15 +33,26 @@ include/QtXml/QXmlNamespaceSupport
include/QtXml/QXmlParseException
include/QtXml/QXmlReader
include/QtXml/QXmlSimpleReader
+include/QtXml/QXmlStreamAttribute
+include/QtXml/QXmlStreamAttributes
+include/QtXml/QXmlStreamEntityDeclaration
+include/QtXml/QXmlStreamEntityDeclarations
+include/QtXml/QXmlStreamNamespaceDeclaration
+include/QtXml/QXmlStreamNamespaceDeclarations
+include/QtXml/QXmlStreamNotationDeclaration
+include/QtXml/QXmlStreamNotationDeclarations
+include/QtXml/QXmlStreamReader
+include/QtXml/QXmlStreamStringRef
+include/QtXml/QXmlStreamWriter
include/QtXml/QtXml
include/QtXml/qdom.h
include/QtXml/qxml.h
+include/QtXml/qxmlstream.h
lib/libQtXml.la
lib/libQtXml.prl
lib/libQtXml.so
lib/libQtXml.so.4
-lib/libQtXml.so.4.2
-lib/libQtXml.so.4.2.3
-lib/libQtXml.so.4.2.3.debug
+lib/libQtXml.so.4.3
+lib/libQtXml.so.4.3.0
libdata/pkgconfig/QtXml.pc
@dirrm include/QtXml
diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index 9e3436a0e5ad..393fd5006cb4 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -7,39 +7,28 @@
#
PORTNAME= gui
-PORTVERSION= 4.2.3
-PORTREVISION= 2
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= x11-toolkits
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
DISTNAME= qt-x11-opensource-src-${PORTVERSION}
DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
-COMMENT?= Qt graphical user interface library
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Qt graphical user interface library
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4 \
- rcc:${PORTSDIR}/devel/qt4-rcc \
- uic-qt4:${PORTSDIR}/devel/qt4-uic
-LIB_DEPENDS?= QtCore:${PORTSDIR}/devel/qt4-corelib \
- png:${PORTSDIR}/graphics/png
+LIB_DEPENDS?= png:${PORTSDIR}/graphics/png
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc rcc uic corelib
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
USE_XLIB= yes
-CONFIGURE_ARGS= -fast -no-exceptions ${CUPS} \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
@@ -93,11 +82,11 @@ pre-configure:
${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/../../bin/uic
post-configure:
- ${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtGui.pc|${PREFIX}/libdata/pkgconfig/QtGui.pc|g' \
- ${WRKSRC}/Makefile
+ ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+ -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${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/*Qt*
+ ${WRKSRC}/../../lib/pkgconfig/*Qt*
.include <bsd.port.post.mk>
diff --git a/x11-toolkits/qt4-gui/distinfo b/x11-toolkits/qt4-gui/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/x11-toolkits/qt4-gui/distinfo
+++ b/x11-toolkits/qt4-gui/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/x11-toolkits/qt4-gui/pkg-plist b/x11-toolkits/qt4-gui/pkg-plist
index 589a6ecf130f..1189b2335021 100644
--- a/x11-toolkits/qt4-gui/pkg-plist
+++ b/x11-toolkits/qt4-gui/pkg-plist
@@ -10,6 +10,7 @@ include/Qt/qabstractslider.h
include/Qt/qabstractspinbox.h
include/Qt/qabstracttextdocumentlayout.h
include/Qt/qaccessible.h
+include/Qt/qaccessible2.h
include/Qt/qaccessiblebridge.h
include/Qt/qaccessibleobject.h
include/Qt/qaccessibleplugin.h
@@ -29,6 +30,7 @@ include/Qt/qclipboard.h
include/Qt/qcolor.h
include/Qt/qcolordialog.h
include/Qt/qcolormap.h
+include/Qt/qcolumnview.h
include/Qt/qcombobox.h
include/Qt/qcommonstyle.h
include/Qt/qcompleter.h
@@ -47,6 +49,7 @@ include/Qt/qdrawutil.h
include/Qt/qerrormessage.h
include/Qt/qevent.h
include/Qt/qfiledialog.h
+include/Qt/qfileiconprovider.h
include/Qt/qfocusframe.h
include/Qt/qfont.h
include/Qt/qfontcombobox.h
@@ -87,6 +90,8 @@ include/Qt/qlistview.h
include/Qt/qlistwidget.h
include/Qt/qmainwindow.h
include/Qt/qmatrix.h
+include/Qt/qmdiarea.h
+include/Qt/qmdisubwindow.h
include/Qt/qmenu.h
include/Qt/qmenubar.h
include/Qt/qmenudata.h
@@ -161,6 +166,7 @@ include/Qt/qtoolbar.h
include/Qt/qtoolbox.h
include/Qt/qtoolbutton.h
include/Qt/qtooltip.h
+include/Qt/qtransform.h
include/Qt/qtreeview.h
include/Qt/qtreewidget.h
include/Qt/qtreewidgetitemiterator.h
@@ -173,7 +179,9 @@ include/Qt/qwidget.h
include/Qt/qwidgetaction.h
include/Qt/qwindowdefs.h
include/Qt/qwindowsstyle.h
+include/Qt/qwindowsvistastyle.h
include/Qt/qwindowsxpstyle.h
+include/Qt/qwizard.h
include/Qt/qwmatrix.h
include/Qt/qworkspace.h
include/Qt/qx11embed_x11.h
@@ -191,10 +199,12 @@ include/QtGui/QAbstractSpinBox
include/QtGui/QAbstractTextDocumentLayout
include/QtGui/QAbstractUndoItem
include/QtGui/QAccessible
+include/QtGui/QAccessible2Interface
include/QtGui/QAccessibleApplication
include/QtGui/QAccessibleBridge
include/QtGui/QAccessibleBridgeFactoryInterface
include/QtGui/QAccessibleBridgePlugin
+include/QtGui/QAccessibleEditableTextInterface
include/QtGui/QAccessibleEvent
include/QtGui/QAccessibleFactoryInterface
include/QtGui/QAccessibleInterface
@@ -202,6 +212,10 @@ include/QtGui/QAccessibleInterfaceEx
include/QtGui/QAccessibleObject
include/QtGui/QAccessibleObjectEx
include/QtGui/QAccessiblePlugin
+include/QtGui/QAccessibleSimpleEditableTextInterface
+include/QtGui/QAccessibleTableInterface
+include/QtGui/QAccessibleTextInterface
+include/QtGui/QAccessibleValueInterface
include/QtGui/QAccessibleWidget
include/QtGui/QAccessibleWidgetEx
include/QtGui/QAction
@@ -224,6 +238,7 @@ include/QtGui/QColor
include/QtGui/QColorDialog
include/QtGui/QColorGroup
include/QtGui/QColormap
+include/QtGui/QColumnView
include/QtGui/QComboBox
include/QtGui/QCommonStyle
include/QtGui/QCompleter
@@ -297,7 +312,10 @@ include/QtGui/QIcon
include/QtGui/QIconDragEvent
include/QtGui/QIconEngine
include/QtGui/QIconEngineFactoryInterface
+include/QtGui/QIconEngineFactoryInterfaceV2
include/QtGui/QIconEnginePlugin
+include/QtGui/QIconEnginePluginV2
+include/QtGui/QIconEngineV2
include/QtGui/QIconSet
include/QtGui/QImage
include/QtGui/QImageIOHandler
@@ -337,6 +355,8 @@ include/QtGui/QMacMime
include/QtGui/QMacPasteboardMime
include/QtGui/QMainWindow
include/QtGui/QMatrix
+include/QtGui/QMdiArea
+include/QtGui/QMdiSubWindow
include/QtGui/QMenu
include/QtGui/QMenuBar
include/QtGui/QMenuItem
@@ -410,11 +430,13 @@ include/QtGui/QStyleFactory
include/QtGui/QStyleFactoryInterface
include/QtGui/QStyleHintReturn
include/QtGui/QStyleHintReturnMask
+include/QtGui/QStyleHintReturnVariant
include/QtGui/QStyleOption
include/QtGui/QStyleOptionButton
include/QtGui/QStyleOptionComboBox
include/QtGui/QStyleOptionComplex
include/QtGui/QStyleOptionDockWidget
+include/QtGui/QStyleOptionDockWidgetV2
include/QtGui/QStyleOptionFocusRect
include/QtGui/QStyleOptionFrame
include/QtGui/QStyleOptionFrameV2
@@ -438,9 +460,11 @@ include/QtGui/QStyleOptionTabWidgetFrame
include/QtGui/QStyleOptionTitleBar
include/QtGui/QStyleOptionToolBar
include/QtGui/QStyleOptionToolBox
+include/QtGui/QStyleOptionToolBoxV2
include/QtGui/QStyleOptionToolButton
include/QtGui/QStyleOptionViewItem
include/QtGui/QStyleOptionViewItemV2
+include/QtGui/QStyleOptionViewItemV3
include/QtGui/QStylePainter
include/QtGui/QStylePlugin
include/QtGui/QSyntaxHighlighter
@@ -487,6 +511,7 @@ include/QtGui/QToolBarChangeEvent
include/QtGui/QToolBox
include/QtGui/QToolButton
include/QtGui/QToolTip
+include/QtGui/QTransform
include/QtGui/QTreeView
include/QtGui/QTreeWidget
include/QtGui/QTreeWidgetItem
@@ -512,7 +537,10 @@ include/QtGui/QWidgetSet
include/QtGui/QWindowStateChangeEvent
include/QtGui/QWindowsMime
include/QtGui/QWindowsStyle
+include/QtGui/QWindowsVistaStyle
include/QtGui/QWindowsXPStyle
+include/QtGui/QWizard
+include/QtGui/QWizardPage
include/QtGui/QWorkspace
include/QtGui/QX11EmbedContainer
include/QtGui/QX11EmbedWidget
@@ -530,6 +558,7 @@ include/QtGui/qabstractslider.h
include/QtGui/qabstractspinbox.h
include/QtGui/qabstracttextdocumentlayout.h
include/QtGui/qaccessible.h
+include/QtGui/qaccessible2.h
include/QtGui/qaccessiblebridge.h
include/QtGui/qaccessibleobject.h
include/QtGui/qaccessibleplugin.h
@@ -549,6 +578,7 @@ include/QtGui/qclipboard.h
include/QtGui/qcolor.h
include/QtGui/qcolordialog.h
include/QtGui/qcolormap.h
+include/QtGui/qcolumnview.h
include/QtGui/qcombobox.h
include/QtGui/qcommonstyle.h
include/QtGui/qcompleter.h
@@ -567,6 +597,7 @@ include/QtGui/qdrawutil.h
include/QtGui/qerrormessage.h
include/QtGui/qevent.h
include/QtGui/qfiledialog.h
+include/QtGui/qfileiconprovider.h
include/QtGui/qfocusframe.h
include/QtGui/qfont.h
include/QtGui/qfontcombobox.h
@@ -607,6 +638,8 @@ include/QtGui/qlistview.h
include/QtGui/qlistwidget.h
include/QtGui/qmainwindow.h
include/QtGui/qmatrix.h
+include/QtGui/qmdiarea.h
+include/QtGui/qmdisubwindow.h
include/QtGui/qmenu.h
include/QtGui/qmenubar.h
include/QtGui/qmenudata.h
@@ -681,6 +714,7 @@ include/QtGui/qtoolbar.h
include/QtGui/qtoolbox.h
include/QtGui/qtoolbutton.h
include/QtGui/qtooltip.h
+include/QtGui/qtransform.h
include/QtGui/qtreeview.h
include/QtGui/qtreewidget.h
include/QtGui/qtreewidgetitemiterator.h
@@ -693,7 +727,9 @@ include/QtGui/qwidget.h
include/QtGui/qwidgetaction.h
include/QtGui/qwindowdefs.h
include/QtGui/qwindowsstyle.h
+include/QtGui/qwindowsvistastyle.h
include/QtGui/qwindowsxpstyle.h
+include/QtGui/qwizard.h
include/QtGui/qwmatrix.h
include/QtGui/qworkspace.h
include/QtGui/qx11embed_x11.h
@@ -702,8 +738,7 @@ lib/libQtGui.la
lib/libQtGui.prl
lib/libQtGui.so
lib/libQtGui.so.4
-lib/libQtGui.so.4.2
-lib/libQtGui.so.4.2.3
-lib/libQtGui.so.4.2.3.debug
+lib/libQtGui.so.4.3
+lib/libQtGui.so.4.3.0
libdata/pkgconfig/QtGui.pc
@dirrm include/QtGui
diff --git a/x11/qt4-inputmethods/Makefile b/x11/qt4-inputmethods/Makefile
index abdea88f3501..f836361f37bb 100644
--- a/x11/qt4-inputmethods/Makefile
+++ b/x11/qt4-inputmethods/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= inputmethods
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= x11
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,24 +18,13 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt input method plugins
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4
-LIB_DEPENDS= QtCore:${PORTSDIR}/devel/qt4-corelib \
- QtGui:${PORTSDIR}/x11-toolkits/qt4-gui
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc corelib gui
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/x11/qt4-inputmethods/distinfo b/x11/qt4-inputmethods/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/x11/qt4-inputmethods/distinfo
+++ b/x11/qt4-inputmethods/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/x11/qt4-opengl/Makefile b/x11/qt4-opengl/Makefile
index 69fb879d367a..5bbe7cf165d8 100644
--- a/x11/qt4-opengl/Makefile
+++ b/x11/qt4-opengl/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= opengl
-PORTVERSION= 4.2.3
-PORTREVISION= 3
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= x11
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,27 +18,16 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt OpenGL library
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4
-LIB_DEPENDS?= QtCore:${PORTSDIR}/devel/qt4-corelib \
- QtGui:${PORTSDIR}/x11-toolkits/qt4-gui
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc corelib gui
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GL= yes
USE_XLIB= yes
-CONFIGURE_ARGS= -fast -no-exceptions \
- -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -prefix ${PREFIX} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -no-nas-sound -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
@@ -61,7 +50,7 @@ CONFIGURE_WRKSRC=${WRKSRC}/../../
.include <bsd.port.pre.mk>
pre-configure:
- ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
+ ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \
-e 's|flat_headers.path.*|flat_headers.path=${PREFIX}/include/Qt|g' \
-e 's|targ_headers.path.*|targ_headers.path=${PREFIX}/include/$$$$TARGET|g' \
@@ -71,11 +60,11 @@ pre-configure:
${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc
post-configure:
- ${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtOpenGL.pc|${PREFIX}/libdata/pkgconfig/QtOpenGL.pc|g' \
+ ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-e 's|.*$$(QMAKE).*||g' ${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/*Qt*
+ ${WRKSRC}/../../lib/pkgconfig/*Qt*
.include <bsd.port.post.mk>
diff --git a/x11/qt4-opengl/distinfo b/x11/qt4-opengl/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/x11/qt4-opengl/distinfo
+++ b/x11/qt4-opengl/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/x11/qt4-opengl/pkg-plist b/x11/qt4-opengl/pkg-plist
index 2499445c285f..876fccd7e413 100644
--- a/x11/qt4-opengl/pkg-plist
+++ b/x11/qt4-opengl/pkg-plist
@@ -18,8 +18,8 @@ lib/libQtOpenGL.la
lib/libQtOpenGL.prl
lib/libQtOpenGL.so
lib/libQtOpenGL.so.4
-lib/libQtOpenGL.so.4.2
-lib/libQtOpenGL.so.4.2.3
-lib/libQtOpenGL.so.4.2.3.debug
+lib/libQtOpenGL.so.4.3
+lib/libQtOpenGL.so.4.3.0
+lib/libQtOpenGL.so.4.3.0.debug
libdata/pkgconfig/QtOpenGL.pc
@dirrm include/QtOpenGL