diff options
| author | makc <makc@FreeBSD.org> | 2013-02-04 01:21:56 +0800 |
|---|---|---|
| committer | makc <makc@FreeBSD.org> | 2013-02-04 01:21:56 +0800 |
| commit | 99769320fd4c679659164e26326974d75794145f (patch) | |
| tree | 66fbbfbf5bab18e735ad851a8c6925ac9e54cd31 | |
| parent | b472ed86be0fe9e643211a1b67de130ed818de06 (diff) | |
| download | freebsd-ports-gnome-99769320fd4c679659164e26326974d75794145f.tar.gz freebsd-ports-gnome-99769320fd4c679659164e26326974d75794145f.tar.zst freebsd-ports-gnome-99769320fd4c679659164e26326974d75794145f.zip | |
KDE/FreeBSD team presents Qt 4.8.4 and QtCreator 2.6.1 ports.
The area51 repository features commits by Alonso Schaich, avilla, fluffy,
jhale, makc and rakuco.
Common changes:
- Trim Makefile header
- Convert to new option framework
- Add/improve desktop entries
- Remove upstreamed patches
Mk/bsd.qt.mk:
- Set QMAKESPEC at late stage (to fix potential problem if USE_GCC is used) [1]
devel/qmake:
- Fix crash due to off-by one error [2]
multimedia/qt4-phonon*:
- Deprecate in favour of multimedia/phonon*
www/qt4-webkit:
- Make dependence on GStreamer optional [3]
devel/qtcreator:
- Enable qml-designer in devel/qtcreator (requires privite Qt headers) [4]
Reported by: avg via irc [1]
Submitted by: avg via maillist [2]
PR: ports/175644 [3]
Submitted by: danfe [3]
PR: ports/169809 [4]
Reported by: tcb <tcberner at gmail.com> [4]
86 files changed, 635 insertions, 810 deletions
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index f1cfc0e09e60..8e49c63f3288 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -1,6 +1,3 @@ -#-*- tab-width: 4; -*- -# ex:ts=4 -# # $FreeBSD$ # # Variables: @@ -8,8 +5,6 @@ # QT_DIST - Package being built is part of the Qt distribution. # # Global switches (add this to /etc/make.conf): -# WITH_QT_PHONON - If set, Qt phonon will be used instead of standalone. -# Qt phonon doesn't work with KDE 4.4. # QT4_OPTIONS - A list of options, can be CUPS, NAS and/or QGTKSTYLE. # If set, Qt will be built with support for: # - Common UNIX Printing System (CUPS); @@ -65,10 +60,11 @@ CONFIGURE_ARGS+=-fast -platform ${QMAKESPEC} \ PLIST_SUB+= SHLIB_VER=${QT4_VERSION:C/-.*//} \ SHLIB_SHVER=${QT4_VERSION:R} -.if defined(PACKAGE_BUILDING) -CONFIGURE_ARGS+=-no-mmx -no-3dnow -no-sse -no-sse2 -no-sse3 \ - -no-ssse3 -no-sse4.1 -no-sse4.2 -.endif #defined(PACKAGE_BUILDING) +# SIMD support is detected on runtime, no need to disable on build. +#.if defined(PACKAGE_BUILDING) +#CONFIGURE_ARGS+=-no-mmx -no-3dnow -no-sse -no-sse2 -no-sse3 \ +# -no-ssse3 -no-sse4.1 -no-sse4.2 +#.endif #defined(PACKAGE_BUILDING) # .if defined(PORTNAME) && ${PORTNAME} != "xmlpatterns" # CONFIGURE_ARGS+=-no-exceptions @@ -110,34 +106,6 @@ QMAKEFLAGS+= QMAKE_CC="${CC}" QMAKE_CXX="${CXX}" \ QMAKE_CFLAGS_THREAD="${PTHREAD_CFLAGS}" \ QMAKE_LFLAGS_THREAD="${PTHREAD_LIBS}" -# -# Translate `c++` to its real name and select the appropriate mkspec. -# -QMAKE_BASE_COMPILER!= cc --version 2> /dev/null | ${AWK} 'NR == 1 { gsub(/[()]/, "", $$2); print $$2 }' -.if ${QMAKE_BASE_COMPILER:L} == "gcc" -QMAKE_BASE_COMPILER= g++ -.endif -.if ${CXX} == "c++" -# Why CXX instead of CXX:T? Because if you're setting the full path of -# `c++` you probably want to define QMAKESPEC by hand too. -QMAKE_COMPILER= ${QMAKE_BASE_COMPILER} -.elif ${CXX:T} == "clang++" -QMAKE_COMPILER= clang -.elif ${CXX:C/c\+\+/g++/:T} == "llvm-g++" -QMAKE_COMPILER= llvm -.elif ${CXX:T} == "icpc" -QMAKE_COMPILER= icc -.else -# Handle all the other cases (mainly g++*). -QMAKE_COMPILER= ${CXX:C/c\+\+/g++/:T} -.endif -.if exists(${QT_PREFIX}/share/qt4/mkspecs/freebsd-${QMAKE_COMPILER}) -QMAKESPEC?= ${QT_PREFIX}/share/qt4/mkspecs/freebsd-${QMAKE_COMPILER} -.else -# If something went wrong, default to the base configuration. -QMAKESPEC?= ${QT_PREFIX}/share/qt4/mkspecs/freebsd-${QMAKE_BASE_COMPILER} -.endif - QTCPPFLAGS?= QTCGFLIBS?= @@ -146,7 +114,7 @@ QTCGFLIBS?= # # QT4 version # -QT4_VERSION?= 4.8.2 +QT4_VERSION?= 4.8.4 _USE_QT4_ALL= accessible assistant assistant-adp assistantclient \ clucene codecs-cn codecs-jp codecs-kr codecs-tw corelib \ @@ -270,7 +238,7 @@ porting_DEPENDS= ${QT_PREFIX}/bin/qt3to4 qdbusviewer_PORT= devel/qt4-qdbusviewer qdbusviewer_DEPENDS= ${QT_PREFIX}/bin/qdbusviewer -qmlviewer_PORT= devel/qt4-qmlviewer +qmlviewer_PORT= devel/qt4-qmlviewer qmlviewer_DEPENDS= ${QT_PREFIX}/bin/qmlviewer qdoc3_PORT= devel/qt4-qdoc3 @@ -345,6 +313,34 @@ xmlpatterns-tool_DEPENDS= ${QT_PREFIX}/bin/xmlpatterns .if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include) Qt_Post_Include= bsd.qt.mk +# +# Translate `c++` to its real name and select the appropriate mkspec. +# +QMAKE_BASE_COMPILER!= cc --version 2> /dev/null | ${AWK} 'NR == 1 { gsub(/[()]/, "", $$2); print $$2 }' +.if ${QMAKE_BASE_COMPILER:L} == "gcc" +QMAKE_BASE_COMPILER= g++ +.endif +.if ${CXX} == "c++" +# Why CXX instead of CXX:T? Because if you're setting the full path of +# `c++` you probably want to define QMAKESPEC by hand too. +QMAKE_COMPILER= ${QMAKE_BASE_COMPILER} +.elif ${CXX:T} == "clang++" +QMAKE_COMPILER= clang +.elif ${CXX:C/c\+\+/g++/:T} == "llvm-g++" +QMAKE_COMPILER= llvm +.elif ${CXX:T} == "icpc" +QMAKE_COMPILER= icc +.else +# Handle all the other cases (mainly g++*). +QMAKE_COMPILER= ${CXX:C/c\+\+/g++/:T} +.endif +.if exists(${QT_PREFIX}/share/qt4/mkspecs/freebsd-${QMAKE_COMPILER}) +QMAKESPEC?= ${QT_PREFIX}/share/qt4/mkspecs/freebsd-${QMAKE_COMPILER} +.else +# If something went wrong, default to the base configuration. +QMAKESPEC?= ${QT_PREFIX}/share/qt4/mkspecs/freebsd-${QMAKE_BASE_COMPILER} +.endif + .for component in ${_USE_QT4_ALL} ${component}_BUILD_DEPENDS?= ${${component}_DEPENDS}:${PORTSDIR}/${${component}_PORT} ${component}_RUN_DEPENDS?= ${${component}_DEPENDS}:${PORTSDIR}/${${component}_PORT} @@ -355,9 +351,6 @@ ${component}_run_RUN_DEPENDS?= ${${component}_RUN_DEPENDS} _USE_QT4_ALL_SUFFIXED+= ${component} ${component}_build ${component}_run .endfor -.if defined(QT_COMPONENTS) -USE_QT4= ${QT_COMPONENTS} -.endif .if defined(USE_QT4) . for component in ${USE_QT4:O:u} . if ${_USE_QT4_ALL_SUFFIXED:M${component}}!= "" diff --git a/accessibility/qt4-accessible/Makefile b/accessibility/qt4-accessible/Makefile index bcfa8cdf5cc0..e175b668f294 100644 --- a/accessibility/qt4-accessible/Makefile +++ b/accessibility/qt4-accessible/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= accessible DISTVERSION= ${QT4_VERSION} diff --git a/chinese/qt4-codecs-cn/Makefile b/chinese/qt4-codecs-cn/Makefile index 72b085611d49..ebadf130eca3 100644 --- a/chinese/qt4-codecs-cn/Makefile +++ b/chinese/qt4-codecs-cn/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= codecs DISTVERSION= ${QT4_VERSION} diff --git a/chinese/qt4-codecs-tw/Makefile b/chinese/qt4-codecs-tw/Makefile index ed2d86033179..3dae2f4701da 100644 --- a/chinese/qt4-codecs-tw/Makefile +++ b/chinese/qt4-codecs-tw/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= codecs DISTVERSION= ${QT4_VERSION} diff --git a/databases/qt4-ibase-plugin/Makefile b/databases/qt4-ibase-plugin/Makefile index 5a8128810d0a..de16bf155ad4 100644 --- a/databases/qt4-ibase-plugin/Makefile +++ b/databases/qt4-ibase-plugin/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt-ibase-plugin -# Date created: 27 February 2004 -# Whom: Michael Nottebrock <lofi@freebsd.org> -# +# Created by: Michael Nottebrock <lofi@freebsd.org> # $FreeBSD$ -# PORTNAME= qt4-${DB}-plugin DISTVERSION= ${QT4_VERSION} diff --git a/databases/qt4-mysql-plugin/Makefile b/databases/qt4-mysql-plugin/Makefile index c554119f6a89..cd42166a81cd 100644 --- a/databases/qt4-mysql-plugin/Makefile +++ b/databases/qt4-mysql-plugin/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt-mysql-plugin -# Date created: 20 April 2003 -# Whom: Kay Lehmann <kay_lehmann@web.de> -# +# Created by: Kay Lehmann <kay_lehmann@web.de> # $FreeBSD$ -# PORTNAME= qt4-${DB}-plugin DISTVERSION= ${QT4_VERSION} diff --git a/databases/qt4-odbc-plugin/Makefile b/databases/qt4-odbc-plugin/Makefile index 148140a7c151..0d771853af34 100644 --- a/databases/qt4-odbc-plugin/Makefile +++ b/databases/qt4-odbc-plugin/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt-odbc-plugin -# Date created: 31 December 2003 -# Whom: Michael Nottebrock <lofi@freebsd.org> -# +# Created by: Michael Nottebrock <lofi@freebsd.org> # $FreeBSD$ -# PORTNAME= qt4-${DB}-plugin DISTVERSION= ${QT4_VERSION} diff --git a/databases/qt4-pgsql-plugin/Makefile b/databases/qt4-pgsql-plugin/Makefile index 7af82d56a597..c83d0386874f 100644 --- a/databases/qt4-pgsql-plugin/Makefile +++ b/databases/qt4-pgsql-plugin/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt-pgsql-plugin -# Date created: 5 August 2003 -# Whom: Lauri Watts <lauri@kde.org> -# +# Created by: Lauri Watts <lauri@kde.org> # $FreeBSD$ -# PORTNAME= qt4-${DB}-plugin DISTVERSION= ${QT4_VERSION} diff --git a/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile index 43a52983414d..36403c57e265 100644 --- a/databases/qt4-sql/Makefile +++ b/databases/qt4-sql/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= sql DISTVERSION= ${QT4_VERSION} diff --git a/databases/qt4-sqlite-plugin/Makefile b/databases/qt4-sqlite-plugin/Makefile index 72a342fb8ff7..2b70ffa04366 100644 --- a/databases/qt4-sqlite-plugin/Makefile +++ b/databases/qt4-sqlite-plugin/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt-sqlite-plugin -# Date created: 27 February 2004 -# Whom: Michael Nottebrock <lofi@freebsd.org> -# +# Created by: Michael Nottebrock <lofi@freebsd.org> # $FreeBSD$ -# PORTNAME= qt4-${DB}-plugin DISTVERSION= ${QT4_VERSION} diff --git a/databases/qt4-sqlite3-plugin/Makefile b/databases/qt4-sqlite3-plugin/Makefile index befcb225d775..c0e5aa98ce6a 100644 --- a/databases/qt4-sqlite3-plugin/Makefile +++ b/databases/qt4-sqlite3-plugin/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt-sqlite-plugin -# Date created: 27 February 2004 -# Whom: Michael Nottebrock <lofi@freebsd.org> -# +# Created by: Michael Nottebrock <lofi@freebsd.org> # $FreeBSD$ -# PORTNAME= qt4-${DB}-plugin DISTVERSION= ${QT4_VERSION} diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile index 87ba33f84f46..68b5e65709f4 100644 --- a/devel/dbus-qt4/Makefile +++ b/devel/dbus-qt4/Makefile @@ -1,10 +1,5 @@ -### -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= dbus DISTVERSION= ${QT4_VERSION} diff --git a/devel/dbus-qt4/files/patch-src__corelib__tools__qiterator.h b/devel/dbus-qt4/files/patch-src__corelib__tools__qiterator.h deleted file mode 100644 index 9a2a2ca2daa7..000000000000 --- a/devel/dbus-qt4/files/patch-src__corelib__tools__qiterator.h +++ /dev/null @@ -1,38 +0,0 @@ -commit 5210d47aa66214e3cb16f394d0510a91f770c1b1 -Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> -Date: Mon Jul 16 23:39:07 2012 -0300 - - Only forward-declare some std classes if QT_NO_STL is defined. - - If that is not done, building with clang, libc++ and C++11 support - does not work: libc++ defines the iterator tag classes in an inline - namespace inside the std namespace, and forward-declaring those - classes inside the std namespace itself in qiterator.h causes an - ambiguity that clang solves by choosing the incomplete-declared class - declared in the enclosing std namespace. - - This is probably the "clang build problem" reported in commit - 19e2b4d6eb733d9fd4eb69c0622b699fd08a3203 to qtbase, which cannot be - directly cherry-picked without breaking other classes due to QT_NO_STL - still being present in Qt 4. - - Change-Id: I26e33915347d3f94ef2e10b68fca6b2099ec9491 - Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> - -diff --git a/src/corelib/tools/qiterator.h b/src/corelib/tools/qiterator.h -index 0747940..b9d8da6 100644 ---- ./src/corelib/tools/qiterator.h -+++ ./src/corelib/tools/qiterator.h -@@ -46,10 +46,12 @@ - - QT_BEGIN_HEADER - -+#ifdef QT_NO_STL - namespace std { - struct bidirectional_iterator_tag; - struct random_access_iterator_tag; - } -+#endif - - QT_BEGIN_NAMESPACE - diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile index 12fc01de7fc2..5187da05e7f2 100644 --- a/devel/qmake4/Makefile +++ b/devel/qmake4/Makefile @@ -1,19 +1,15 @@ -# New ports collection makefile for: qmake-4 -# Date created: Tue Jul 12 16:04:29 UTC 2005 -# Whom: lofi@freebsd.org, -# mi@aldan.algebra.com -# +# Created by: lofi@freebsd.org, mi@aldan.algebra.com # $FreeBSD$ PORTNAME= qmake DISTVERSION= ${QT4_VERSION} -PORTREVISION= 3 CATEGORIES= devel PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= The build utility of the Qt project +USE_QT4= #empty QT_NONSTANDARD= yes QT_DIST= yes REINPLACE_ARGS= -i "" @@ -80,14 +76,7 @@ do-configure: ${ECHO} '/* empty */' > ${WRKSRC}/qconfig.h ${LN} ${WRKSRC}/qconfig.h ${WRKSRC}/../src/corelib/global/qconfig.h -.include <bsd.port.pre.mk> -.include "${.CURDIR}/../../Mk/bsd.qt.mk" - -.if ${ARCH} == "alpha" -CXXFLAGS+= -mieee -.endif - post-install: ${LN} -sf ${PREFIX}/share/qt4/mkspecs/freebsd-${QMAKE_BASE_COMPILER} ${PREFIX}/share/qt4/mkspecs/default -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/qmake4/files/patch-option.cpp b/devel/qmake4/files/patch-option.cpp new file mode 100644 index 000000000000..e93b6be46ec1 --- /dev/null +++ b/devel/qmake4/files/patch-option.cpp @@ -0,0 +1,11 @@ +--- ./option.cpp.orig 2012-09-11 01:36:36.000000000 +0000 ++++ ./option.cpp 2012-10-27 21:51:28.131151563 +0000 +@@ -482,7 +482,7 @@ + env_argc++; + } + } else { +- if(!env_argv || env_argc > env_size) { ++ if(!env_argv || env_argc >= env_size) { + env_argv = (char **)realloc(env_argv, sizeof(char *)*(env_size+=10)); + for(int i2 = env_argc; i2 < env_size; i2++) + env_argv[i2] = NULL; diff --git a/devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff b/devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff index 6d64ad555b31..1d1d1096fd03 100644 --- a/devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff +++ b/devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff @@ -1,5 +1,5 @@ ---- ../mkspecs/freebsd-g++/qmake.conf.old 2011-09-17 01:02:43.000000000 -0300 -+++ ../mkspecs/freebsd-g++/qmake.conf 2011-09-17 00:23:09.000000000 -0300 +--- ../mkspecs/freebsd-g++/qmake.conf.orig 2012-09-10 18:36:35.000000000 -0700 ++++ ../mkspecs/freebsd-g++/qmake.conf 2012-09-16 16:13:00.894513577 -0700 @@ -13,8 +13,8 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD @@ -11,16 +11,11 @@ QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] ---- ../mkspecs/freebsd-g++46/qmake.conf.old 2011-09-17 01:03:00.000000000 -0300 -+++ ../mkspecs/freebsd-g++46/qmake.conf 2011-09-17 00:23:41.000000000 -0300 -@@ -12,13 +12,9 @@ - +--- ../mkspecs/freebsd-g++46/qmake.conf.orig 2012-09-10 18:36:35.000000000 -0700 ++++ ../mkspecs/freebsd-g++46/qmake.conf 2012-09-16 16:13:00.894513577 -0700 +@@ -13,8 +13,8 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD --QMAKE_CC = gcc46 -- --QMAKE_CXX = g++46 -- # Addon software goes into /usr/local on the BSDs, by default we will look there -QMAKE_INCDIR = /usr/local/include -QMAKE_LIBDIR = /usr/local/lib @@ -29,18 +24,3 @@ QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -@@ -55,4 +51,14 @@ - include(../common/unix.conf) - include(../common/gcc-base-unix.conf) - include(../common/g++-unix.conf) -+ -+# Redefined here because g++-base.conf sets QMAKE_CC and QMAKE_CXX -+# to gcc and g++, respectively. -+QMAKE_CC = gcc46 -+QMAKE_CXX = g++46 -+QMAKE_LINK_C = $$QMAKE_CC -+QMAKE_LINK_C_SHLIB = $$QMAKE_CC -+QMAKE_LINK = $$QMAKE_CXX -+QMAKE_LINK_SHLIB = $$QMAKE_CXX -+ - load(qt_config) diff --git a/devel/qmake4/pkg-plist b/devel/qmake4/pkg-plist index 5d855583e660..6aee690dad84 100644 --- a/devel/qmake4/pkg-plist +++ b/devel/qmake4/pkg-plist @@ -7,6 +7,10 @@ share/qt4/mkspecs/aix-xlc-64/qmake.conf share/qt4/mkspecs/aix-xlc-64/qplatformdefs.h share/qt4/mkspecs/aix-xlc/qmake.conf share/qt4/mkspecs/aix-xlc/qplatformdefs.h +share/qt4/mkspecs/blackberry-armv7le-qcc/qmake.conf +share/qt4/mkspecs/blackberry-armv7le-qcc/qplatformdefs.h +share/qt4/mkspecs/blackberry-x86-qcc/qmake.conf +share/qt4/mkspecs/blackberry-x86-qcc/qplatformdefs.h share/qt4/mkspecs/common/aix/qplatformdefs.h share/qt4/mkspecs/common/armcc.conf share/qt4/mkspecs/common/c89/qplatformdefs.h @@ -15,11 +19,22 @@ share/qt4/mkspecs/common/g++-base.conf share/qt4/mkspecs/common/g++-macx.conf share/qt4/mkspecs/common/g++-unix.conf share/qt4/mkspecs/common/g++.conf +share/qt4/mkspecs/common/gcc-base-ios.conf share/qt4/mkspecs/common/gcc-base-macx.conf share/qt4/mkspecs/common/gcc-base-unix.conf share/qt4/mkspecs/common/gcc-base.conf share/qt4/mkspecs/common/ghs-base-integrity.conf share/qt4/mkspecs/common/integrity/qplatformdefs.h +share/qt4/mkspecs/common/ios.conf +share/qt4/mkspecs/common/ios/GLES/gl.h +share/qt4/mkspecs/common/ios/GLES2/gl2.h +share/qt4/mkspecs/common/ios/arch.conf +share/qt4/mkspecs/common/ios/clang.conf +share/qt4/mkspecs/common/ios/g++.conf +share/qt4/mkspecs/common/ios/llvm.conf +share/qt4/mkspecs/common/ios/qmake.conf +share/qt4/mkspecs/common/ios/qplatformdefs.h +share/qt4/mkspecs/common/ios/versions.conf share/qt4/mkspecs/common/linux.conf share/qt4/mkspecs/common/llvm.conf share/qt4/mkspecs/common/mac.conf @@ -76,6 +91,7 @@ share/qt4/mkspecs/features/declarative_debug.prf share/qt4/mkspecs/features/default_post.prf share/qt4/mkspecs/features/default_pre.prf share/qt4/mkspecs/features/designer.prf +share/qt4/mkspecs/features/device_config.prf share/qt4/mkspecs/features/dll.prf share/qt4/mkspecs/features/egl.prf share/qt4/mkspecs/features/enable_backup.prf @@ -287,16 +303,10 @@ share/qt4/mkspecs/netbsd-g++/qmake.conf share/qt4/mkspecs/netbsd-g++/qplatformdefs.h share/qt4/mkspecs/openbsd-g++/qmake.conf share/qt4/mkspecs/openbsd-g++/qplatformdefs.h -share/qt4/mkspecs/qpa/common/g++-base-macx-iphone.conf -share/qt4/mkspecs/qpa/common/g++-base-macx-iphonedevice.conf -share/qt4/mkspecs/qpa/macx-iphonedevice-g++-armv6/qmake.conf -share/qt4/mkspecs/qpa/macx-iphonedevice-g++-armv6/qplatformdefs.h -share/qt4/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/qmake.conf -share/qt4/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/qplatformdefs.h -share/qt4/mkspecs/qpa/macx-iphonedevice-g++/qmake.conf -share/qt4/mkspecs/qpa/macx-iphonedevice-g++/qplatformdefs.h -share/qt4/mkspecs/qpa/macx-iphonesimulator-g++/qmake.conf -share/qt4/mkspecs/qpa/macx-iphonesimulator-g++/qplatformdefs.h +share/qt4/mkspecs/qnx-armv7le-qcc/qmake.conf +share/qt4/mkspecs/qnx-armv7le-qcc/qplatformdefs.h +share/qt4/mkspecs/qnx-x86-qcc/qmake.conf +share/qt4/mkspecs/qnx-x86-qcc/qplatformdefs.h share/qt4/mkspecs/qws/freebsd-generic-g++/qmake.conf share/qt4/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h share/qt4/mkspecs/qws/integrity-arm-cxarm/qmake.conf @@ -401,10 +411,6 @@ share/qt4/mkspecs/unixware-cc/qmake.conf share/qt4/mkspecs/unixware-cc/qplatformdefs.h share/qt4/mkspecs/unixware-g++/qmake.conf share/qt4/mkspecs/unixware-g++/qplatformdefs.h -share/qt4/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf -share/qt4/mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h -share/qt4/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf -share/qt4/mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h share/qt4/mkspecs/unsupported/linux-armcc/qmake.conf share/qt4/mkspecs/unsupported/linux-armcc/qplatformdefs.h share/qt4/mkspecs/unsupported/linux-clang/qmake.conf @@ -417,12 +423,32 @@ share/qt4/mkspecs/unsupported/macx-clang/Info.plist.app share/qt4/mkspecs/unsupported/macx-clang/Info.plist.lib share/qt4/mkspecs/unsupported/macx-clang/qmake.conf share/qt4/mkspecs/unsupported/macx-clang/qplatformdefs.h +share/qt4/mkspecs/unsupported/macx-iosdevice-clang-legacy/qmake.conf +share/qt4/mkspecs/unsupported/macx-iosdevice-clang-legacy/qplatformdefs.h +share/qt4/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf +share/qt4/mkspecs/unsupported/macx-iosdevice-clang/qplatformdefs.h +share/qt4/mkspecs/unsupported/macx-iosdevice-g++-legacy/qmake.conf +share/qt4/mkspecs/unsupported/macx-iosdevice-g++-legacy/qplatformdefs.h +share/qt4/mkspecs/unsupported/macx-iosdevice-g++/qmake.conf +share/qt4/mkspecs/unsupported/macx-iosdevice-g++/qplatformdefs.h +share/qt4/mkspecs/unsupported/macx-iosdevice-llvm-legacy/qmake.conf +share/qt4/mkspecs/unsupported/macx-iosdevice-llvm-legacy/qplatformdefs.h +share/qt4/mkspecs/unsupported/macx-iosdevice-llvm/qmake.conf +share/qt4/mkspecs/unsupported/macx-iosdevice-llvm/qplatformdefs.h +share/qt4/mkspecs/unsupported/macx-iossimulator-clang-legacy/qmake.conf +share/qt4/mkspecs/unsupported/macx-iossimulator-clang-legacy/qplatformdefs.h +share/qt4/mkspecs/unsupported/macx-iossimulator-clang/qmake.conf +share/qt4/mkspecs/unsupported/macx-iossimulator-clang/qplatformdefs.h +share/qt4/mkspecs/unsupported/macx-iossimulator-g++-legacy/qmake.conf +share/qt4/mkspecs/unsupported/macx-iossimulator-g++-legacy/qplatformdefs.h +share/qt4/mkspecs/unsupported/macx-iossimulator-g++/qmake.conf +share/qt4/mkspecs/unsupported/macx-iossimulator-g++/qplatformdefs.h +share/qt4/mkspecs/unsupported/macx-iossimulator-llvm-legacy/qmake.conf +share/qt4/mkspecs/unsupported/macx-iossimulator-llvm-legacy/qplatformdefs.h +share/qt4/mkspecs/unsupported/macx-iossimulator-llvm/qmake.conf +share/qt4/mkspecs/unsupported/macx-iossimulator-llvm/qplatformdefs.h share/qt4/mkspecs/unsupported/qnx-X11-g++/qmake.conf share/qt4/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h -share/qt4/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf -share/qt4/mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h -share/qt4/mkspecs/unsupported/qnx-x86-qcc/qmake.conf -share/qt4/mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h share/qt4/mkspecs/unsupported/qws/integrity-x86-cx86/qmake.conf share/qt4/mkspecs/unsupported/qws/integrity-x86-cx86/qplatformdefs.h share/qt4/mkspecs/unsupported/qws/linux-x86-openkode-g++/qmake.conf @@ -457,6 +483,8 @@ share/qt4/mkspecs/win32-msvc2008/qmake.conf share/qt4/mkspecs/win32-msvc2008/qplatformdefs.h share/qt4/mkspecs/win32-msvc2010/qmake.conf share/qt4/mkspecs/win32-msvc2010/qplatformdefs.h +share/qt4/mkspecs/win32-msvc2012/qmake.conf +share/qt4/mkspecs/win32-msvc2012/qplatformdefs.h share/qt4/mkspecs/wince50standard-armv4i-msvc2005/default_post.prf share/qt4/mkspecs/wince50standard-armv4i-msvc2005/qmake.conf share/qt4/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h @@ -547,6 +575,7 @@ share/qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h @dirrm share/qt4/mkspecs/wince50standard-mipsii-msvc2005 @dirrm share/qt4/mkspecs/wince50standard-armv4i-msvc2008 @dirrm share/qt4/mkspecs/wince50standard-armv4i-msvc2005 +@dirrm share/qt4/mkspecs/win32-msvc2012 @dirrm share/qt4/mkspecs/win32-msvc2010 @dirrm share/qt4/mkspecs/win32-msvc2008 @dirrm share/qt4/mkspecs/win32-msvc2005 @@ -565,16 +594,24 @@ share/qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h @dirrm share/qt4/mkspecs/unsupported/qws/linux-x86-openkode-g++ @dirrm share/qt4/mkspecs/unsupported/qws/integrity-x86-cx86 @dirrm share/qt4/mkspecs/unsupported/qws -@dirrm share/qt4/mkspecs/unsupported/qnx-x86-qcc -@dirrm share/qt4/mkspecs/unsupported/qnx-armv7le-qcc @dirrm share/qt4/mkspecs/unsupported/qnx-X11-g++ +@dirrm share/qt4/mkspecs/unsupported/macx-iossimulator-llvm-legacy +@dirrm share/qt4/mkspecs/unsupported/macx-iossimulator-llvm +@dirrm share/qt4/mkspecs/unsupported/macx-iossimulator-g++-legacy +@dirrm share/qt4/mkspecs/unsupported/macx-iossimulator-g++ +@dirrm share/qt4/mkspecs/unsupported/macx-iossimulator-clang-legacy +@dirrm share/qt4/mkspecs/unsupported/macx-iossimulator-clang +@dirrm share/qt4/mkspecs/unsupported/macx-iosdevice-llvm-legacy +@dirrm share/qt4/mkspecs/unsupported/macx-iosdevice-llvm +@dirrm share/qt4/mkspecs/unsupported/macx-iosdevice-g++-legacy +@dirrm share/qt4/mkspecs/unsupported/macx-iosdevice-g++ +@dirrm share/qt4/mkspecs/unsupported/macx-iosdevice-clang-legacy +@dirrm share/qt4/mkspecs/unsupported/macx-iosdevice-clang @dirrm share/qt4/mkspecs/unsupported/macx-clang @dirrm share/qt4/mkspecs/unsupported/linux-scratchbox2-g++ @dirrm share/qt4/mkspecs/unsupported/linux-host-g++ @dirrm share/qt4/mkspecs/unsupported/linux-clang @dirrm share/qt4/mkspecs/unsupported/linux-armcc -@dirrm share/qt4/mkspecs/unsupported/blackberry-x86-qcc -@dirrm share/qt4/mkspecs/unsupported/blackberry-armv7le-qcc @dirrm share/qt4/mkspecs/unsupported @dirrm share/qt4/mkspecs/unixware-g++ @dirrm share/qt4/mkspecs/unixware-cc @@ -629,12 +666,8 @@ share/qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h @dirrm share/qt4/mkspecs/qws/integrity-arm-cxarm @dirrm share/qt4/mkspecs/qws/freebsd-generic-g++ @dirrm share/qt4/mkspecs/qws -@dirrm share/qt4/mkspecs/qpa/macx-iphonesimulator-g++ -@dirrm share/qt4/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb -@dirrm share/qt4/mkspecs/qpa/macx-iphonedevice-g++-armv6 -@dirrm share/qt4/mkspecs/qpa/macx-iphonedevice-g++ -@dirrm share/qt4/mkspecs/qpa/common -@dirrm share/qt4/mkspecs/qpa +@dirrm share/qt4/mkspecs/qnx-x86-qcc +@dirrm share/qt4/mkspecs/qnx-armv7le-qcc @dirrm share/qt4/mkspecs/openbsd-g++ @dirrm share/qt4/mkspecs/netbsd-g++ @dirrmtry share/qt4/mkspecs/modules @@ -696,10 +729,15 @@ share/qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h @dirrm share/qt4/mkspecs/common/qnx @dirrm share/qt4/mkspecs/common/posix @dirrm share/qt4/mkspecs/common/mac +@dirrm share/qt4/mkspecs/common/ios/GLES2 +@dirrm share/qt4/mkspecs/common/ios/GLES +@dirrm share/qt4/mkspecs/common/ios @dirrm share/qt4/mkspecs/common/integrity @dirrm share/qt4/mkspecs/common/c89 @dirrm share/qt4/mkspecs/common/aix @dirrm share/qt4/mkspecs/common +@dirrm share/qt4/mkspecs/blackberry-x86-qcc +@dirrm share/qt4/mkspecs/blackberry-armv7le-qcc @dirrm share/qt4/mkspecs/aix-xlc-64 @dirrm share/qt4/mkspecs/aix-xlc @dirrm share/qt4/mkspecs/aix-g++-64 diff --git a/devel/qt4-assistant-adp/Makefile b/devel/qt4-assistant-adp/Makefile index c4a6acf22f40..df46c222062b 100644 --- a/devel/qt4-assistant-adp/Makefile +++ b/devel/qt4-assistant-adp/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= assistant PORTVERSION= 4.6.3 diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile index d0c8b07a937f..f3a59287cb78 100644 --- a/devel/qt4-assistant/Makefile +++ b/devel/qt4-assistant/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= assistant DISTVERSION= ${QT4_VERSION} @@ -14,8 +9,9 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation browser -USE_QT4= qmake_build moc_build rcc_build uic_build qt3support corelib \ - gui network sql xml doc help webkit +USE_QT4= qmake_build moc_build rcc_build uic_build \ + corelib gui help network sql webkit xml \ + doc_run sql-sqlite3_run QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_SAFE= yes @@ -29,7 +25,7 @@ MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ DESKTOP_ENTRIES="Qt Assistant" "${COMMENT}" \ "${PREFIX}/share/pixmaps/assistant-qt4.png" \ - "${PREFIX}/bin/assistant-qt4" "" false + "${PREFIX}/bin/assistant-qt4" "Development;Qt;" true DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/dbus src/multimedia src/opengl src/openvg \ diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile index dd0205ea96ff..2e50b167b0c4 100644 --- a/devel/qt4-corelib/Makefile +++ b/devel/qt4-corelib/Makefile @@ -3,7 +3,6 @@ PORTNAME= corelib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES?= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-corelib/files/patch-src__corelib__tools__qiterator.h b/devel/qt4-corelib/files/patch-src__corelib__tools__qiterator.h deleted file mode 100644 index 9a2a2ca2daa7..000000000000 --- a/devel/qt4-corelib/files/patch-src__corelib__tools__qiterator.h +++ /dev/null @@ -1,38 +0,0 @@ -commit 5210d47aa66214e3cb16f394d0510a91f770c1b1 -Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> -Date: Mon Jul 16 23:39:07 2012 -0300 - - Only forward-declare some std classes if QT_NO_STL is defined. - - If that is not done, building with clang, libc++ and C++11 support - does not work: libc++ defines the iterator tag classes in an inline - namespace inside the std namespace, and forward-declaring those - classes inside the std namespace itself in qiterator.h causes an - ambiguity that clang solves by choosing the incomplete-declared class - declared in the enclosing std namespace. - - This is probably the "clang build problem" reported in commit - 19e2b4d6eb733d9fd4eb69c0622b699fd08a3203 to qtbase, which cannot be - directly cherry-picked without breaking other classes due to QT_NO_STL - still being present in Qt 4. - - Change-Id: I26e33915347d3f94ef2e10b68fca6b2099ec9491 - Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> - -diff --git a/src/corelib/tools/qiterator.h b/src/corelib/tools/qiterator.h -index 0747940..b9d8da6 100644 ---- ./src/corelib/tools/qiterator.h -+++ ./src/corelib/tools/qiterator.h -@@ -46,10 +46,12 @@ - - QT_BEGIN_HEADER - -+#ifdef QT_NO_STL - namespace std { - struct bidirectional_iterator_tag; - struct random_access_iterator_tag; - } -+#endif - - QT_BEGIN_NAMESPACE - diff --git a/devel/qt4-corelib/files/patch-src__corelib__tools__qsharedpointer_impl.h b/devel/qt4-corelib/files/patch-src__corelib__tools__qsharedpointer_impl.h deleted file mode 100644 index 215092bf9244..000000000000 --- a/devel/qt4-corelib/files/patch-src__corelib__tools__qsharedpointer_impl.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/corelib/tools/qsharedpointer_impl.h.orig 2012-11-23 15:08:47.000000000 +0800 -+++ src/corelib/tools/qsharedpointer_impl.h 2012-11-23 15:10:22.000000000 +0800 -@@ -592,7 +592,7 @@ - #ifndef QT_NO_QOBJECT - // special constructor that is enabled only if X derives from QObject - template <class X> -- inline QWeakPointer(X *ptr) : d(ptr ? d->getAndRef(ptr) : 0), value(ptr) -+ inline QWeakPointer(X *ptr) : d(ptr ? Data::getAndRef(ptr) : 0), value(ptr) - { } - #endif - template <class X> diff --git a/devel/qt4-declarative/Makefile b/devel/qt4-declarative/Makefile index 51d200dac641..d5e26b4ce04e 100644 --- a/devel/qt4-declarative/Makefile +++ b/devel/qt4-declarative/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: qt4-declarative -# Date created: 23 May 2010 -# Whom: avilla@FreeBSD.org -# # $FreeBSD$ -# PORTNAME= declarative DISTVERSION= ${QT4_VERSION} diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile index 2801797fd0c7..72ab07b37982 100644 --- a/devel/qt4-designer/Makefile +++ b/devel/qt4-designer/Makefile @@ -1,10 +1,5 @@ -### -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= designer DISTVERSION= ${QT4_VERSION} @@ -33,7 +28,7 @@ MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ DESKTOP_ENTRIES="Qt Designer" "${COMMENT}" \ "${PREFIX}/share/pixmaps/designer-qt4.png" \ - "${PREFIX}/bin/designer-qt4" "" false + "${PREFIX}/bin/designer-qt4" "Development;Qt;" true DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/dbus src/multimedia src/opengl src/openvg \ diff --git a/devel/qt4-help-tools/Makefile b/devel/qt4-help-tools/Makefile index 629406b80f77..2148ada37f39 100644 --- a/devel/qt4-help-tools/Makefile +++ b/devel/qt4-help-tools/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: qt4-help-tools -# Date created: Sun May 11 23:30:38 CEST 2008 -# Whom: danny@ricin.com -# +# Created by: danny@ricin.com # $FreeBSD$ -# PORTNAME= help DISTVERSION= ${QT4_VERSION} diff --git a/devel/qt4-help/Makefile b/devel/qt4-help/Makefile index 372be7a2a0dc..d7d6a2b58232 100644 --- a/devel/qt4-help/Makefile +++ b/devel/qt4-help/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: qt4-help -# Date created: Sun May 11 14:43:54 CEST 2008 -# Whom: danny@ricin.com -# +# Created by: danny@ricin.com # $FreeBSD$ -# PORTNAME= help DISTVERSION= ${QT4_VERSION} diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile index 15c12a77958f..499ba5186001 100644 --- a/devel/qt4-libqtassistantclient/Makefile +++ b/devel/qt4-libqtassistantclient/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= libQtAssistantClient PORTVERSION= 4.6.3 diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile index beffcc50be77..c45a36a16bb4 100644 --- a/devel/qt4-linguist/Makefile +++ b/devel/qt4-linguist/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= linguist DISTVERSION= ${QT4_VERSION} @@ -29,7 +24,7 @@ MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ DESKTOP_ENTRIES="Qt Linguist" "${COMMENT}" \ "${PREFIX}/share/pixmaps/linguist-qt4.png" \ - "${PREFIX}/bin/linguist-qt4" "" false + "${PREFIX}/bin/linguist-qt4" "Development;Qt;" true DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/dbus src/multimedia src/network src/opengl \ diff --git a/devel/qt4-makeqpf/Makefile b/devel/qt4-makeqpf/Makefile index f312eb93b666..4ebecef7331c 100644 --- a/devel/qt4-makeqpf/Makefile +++ b/devel/qt4-makeqpf/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= makeqpf DISTVERSION= ${QT4_VERSION} @@ -51,7 +46,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch__tools__makeqpf__qpf2.cpp .endif .if ${ARCH} == "sparc64" -BROKEN= Does not compile on sparc64 +BROKEN= does not compile on sparc64 .endif pre-configure: diff --git a/devel/qt4-moc/Makefile b/devel/qt4-moc/Makefile index 087dcbeb38ad..1d63c32815d7 100644 --- a/devel/qt4-moc/Makefile +++ b/devel/qt4-moc/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= moc DISTVERSION= ${QT4_VERSION} @@ -57,7 +52,7 @@ pre-build: .include <bsd.port.pre.mk> .if ${ARCH} == "arm" -BROKEN= Does not compile on arm +BROKEN= does not compile on arm .endif .include <bsd.port.post.mk> diff --git a/devel/qt4-porting/Makefile b/devel/qt4-porting/Makefile index 02bd2f016b25..6b514fba9346 100644 --- a/devel/qt4-porting/Makefile +++ b/devel/qt4-porting/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= porting DISTVERSION= ${QT4_VERSION} diff --git a/devel/qt4-qdbusviewer/Makefile b/devel/qt4-qdbusviewer/Makefile index e535d00bf778..a17b9839f6d3 100644 --- a/devel/qt4-qdbusviewer/Makefile +++ b/devel/qt4-qdbusviewer/Makefile @@ -1,10 +1,5 @@ -### -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= qdbusviewer DISTVERSION= ${QT4_VERSION} @@ -12,9 +7,9 @@ CATEGORIES?= devel PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org -COMMENT= Qt4 D-BUS viewer +COMMENT= Qt4 D-Bus viewer -LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus +LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus USE_QT4= qmake_build moc_build rcc_build corelib dbus gui xml \ clucene @@ -29,6 +24,10 @@ CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH +DESKTOP_ENTRIES="Qt D-Bus viewer" "${COMMENT}" \ + "${PREFIX}/share/pixmaps/qdbusviewer.png" \ + "${PREFIX}/bin/qdbusviewer" "Development;Qt;" true + DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/multimedia src/network src/opengl src/openvg \ src/phonon src/qt3support src/s60installs src/s60main \ @@ -53,4 +52,8 @@ post-patch: ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc +post-install: + ${INSTALL_DATA} ${BUILD_WRKSRC}/images/qdbusviewer-128.png \ + ${PREFIX}/share/pixmaps/qdbusviewer.png + .include <bsd.port.mk> diff --git a/devel/qt4-qdbusviewer/pkg-plist b/devel/qt4-qdbusviewer/pkg-plist index 5a6cf015d441..6765c67e3788 100644 --- a/devel/qt4-qdbusviewer/pkg-plist +++ b/devel/qt4-qdbusviewer/pkg-plist @@ -1,2 +1,3 @@ bin/qdbusviewer %%DEBUG%%bin/qdbusviewer.debug +share/pixmaps/qdbusviewer.png diff --git a/devel/qt4-qdoc3/Makefile b/devel/qt4-qdoc3/Makefile index c10baab523eb..5acdf369dfee 100644 --- a/devel/qt4-qdoc3/Makefile +++ b/devel/qt4-qdoc3/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: qdoc3 -# Date created: 2009-08-20 -# Whom: Maxim Ignatenko <gelraen.ua@gmail.com> -# +# Created by: Maxim Ignatenko <gelraen.ua@gmail.com> # $FreeBSD$ -# PORTNAME= qdoc3 DISTVERSION= ${QT4_VERSION} diff --git a/devel/qt4-qmlviewer/Makefile b/devel/qt4-qmlviewer/Makefile index 9a623cd1d787..83653b2a303a 100644 --- a/devel/qt4-qmlviewer/Makefile +++ b/devel/qt4-qmlviewer/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: qt4-qmlviewer -# Date created: 13 June 2012 -# Whom: gahr -# +# Created by: gahr # $FreeBSD$ -# PORTNAME= qmlviewer DISTVERSION= ${QT4_VERSION} @@ -26,6 +22,11 @@ CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH +# qtlogo.png is installed by qt4-gui +DESKTOP_ENTRIES="Qt QML viewer" "${COMMENT}" \ + "${LOCALBASE}/share/pixmaps/qtlogo.png" \ + "${PREFIX}/bin/qmlviewer" "Development;Qt;" true + DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/multimedia src/openvg \ src/phonon src/qt3support src/s60installs src/s60main \ diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile index 739afd344ee9..d642d5b17e4b 100644 --- a/devel/qt4-qt3support/Makefile +++ b/devel/qt4-qt3support/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= qt3support DISTVERSION= ${QT4_VERSION} diff --git a/devel/qt4-qtestlib/Makefile b/devel/qt4-qtestlib/Makefile index 63ca2bc17d77..0fb491354ec4 100644 --- a/devel/qt4-qtestlib/Makefile +++ b/devel/qt4-qtestlib/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= qtestlib DISTVERSION= ${QT4_VERSION} diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile index 70f12feb4235..6a564d3e21fc 100644 --- a/devel/qt4-qvfb/Makefile +++ b/devel/qt4-qvfb/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= qvfb DISTVERSION= ${QT4_VERSION} @@ -27,6 +22,10 @@ CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH +DESKTOP_ENTRIES="Qt Virtual Framebuffer" "${COMMENT}" \ + "${PREFIX}/share/pixmaps/qvfb-qt4.png" \ + "${PREFIX}/bin/qvfb-qt4" "Development;Qt;" true + DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/dbus src/multimedia src/network src/opengl \ src/openvg src/phonon src/qt3support src/s60installs \ @@ -56,4 +55,8 @@ pre-configure: ${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/bin/uic ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc +post-install: + ${INSTALL_DATA} ${BUILD_WRKSRC}/images/logo.png \ + ${PREFIX}/share/pixmaps/qvfb-qt4.png + .include <bsd.port.mk> diff --git a/devel/qt4-qvfb/pkg-plist b/devel/qt4-qvfb/pkg-plist index a57af5d2626f..82a3c289ac7d 100644 --- a/devel/qt4-qvfb/pkg-plist +++ b/devel/qt4-qvfb/pkg-plist @@ -1,2 +1,3 @@ bin/qvfb-qt4 %%DEBUG%%bin/qvfb-qt4.debug +share/pixmaps/qvfb-qt4.png diff --git a/devel/qt4-rcc/Makefile b/devel/qt4-rcc/Makefile index 595c43667391..a1bdde5e1b01 100644 --- a/devel/qt4-rcc/Makefile +++ b/devel/qt4-rcc/Makefile @@ -1,10 +1,5 @@ -## -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= rcc DISTVERSION= ${QT4_VERSION} @@ -56,7 +51,7 @@ pre-build: .include <bsd.port.pre.mk> .if ${ARCH} == "arm" -BROKEN= Does not configure on arm +BROKEN= does not configure on arm .endif .include <bsd.port.post.mk> diff --git a/devel/qt4-script/Makefile b/devel/qt4-script/Makefile index e7cf3735657c..d71ea0d7496a 100644 --- a/devel/qt4-script/Makefile +++ b/devel/qt4-script/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= script DISTVERSION= ${QT4_VERSION} diff --git a/devel/qt4-scripttools/Makefile b/devel/qt4-scripttools/Makefile index e5d205e783e1..74838658c357 100644 --- a/devel/qt4-scripttools/Makefile +++ b/devel/qt4-scripttools/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: qt4-scripttools -# Date created: 2009-04-28 -# Whom: Max Brazhnikov <makc@freebsd.org> -# # $FreeBSD$ -# PORTNAME= scripttools DISTVERSION= ${QT4_VERSION} diff --git a/devel/qt4-uic/Makefile b/devel/qt4-uic/Makefile index cc2732c96cb1..84c8fc75d755 100644 --- a/devel/qt4-uic/Makefile +++ b/devel/qt4-uic/Makefile @@ -1,10 +1,5 @@ -### -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= uic DISTVERSION= ${QT4_VERSION} @@ -57,7 +52,7 @@ pre-build: .include <bsd.port.pre.mk> .if ${ARCH} == "arm" -BROKEN= Does not configure on arm +BROKEN= does not configure on arm .endif .include <bsd.port.post.mk> diff --git a/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile index c498e055d140..3f7f6d88755e 100644 --- a/devel/qt4-uic3/Makefile +++ b/devel/qt4-uic3/Makefile @@ -1,14 +1,8 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= uic3 DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES?= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4/Makefile b/devel/qt4/Makefile index 86a1d821c3f5..4ccdf90fa553 100644 --- a/devel/qt4/Makefile +++ b/devel/qt4/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: qt4 -# Date created: 2007-01-25 -# Whom: Michael Nottebrock <lofi@kiste> -# +# Created by: Michael Nottebrock <lofi@kiste> # $FreeBSD$ -# PORTNAME= qt4 DISTVERSION= ${QT4_VERSION} @@ -15,49 +11,56 @@ EXTRACT_ONLY= # empty MAINTAINER= kde@FreeBSD.org COMMENT= Multiplatform C++ application framework (metaport) -OPTIONS= CODECS "Enable support for CN, JP, KR, TW" off \ - SQL_PLUGINS "Database connectivity plugins for QtSql" off \ - TOOLS "Install Qt tools (qmake, moc, etc.)" off \ - DEMO "Install demonstration and example programs" off - -USE_QT4= accessible assistant clucene corelib \ - dbus declarative designer doc \ - graphicssystems-opengl gui help \ - iconengines imageformats inputmethods \ - multimedia network opengl phonon phonon-gst \ - qdbusviewer qt3support qtconfig qtestlib qvfb \ - script scripttools sql svg webkit \ - xml xmlpatterns xmlpatterns-tool +USE_QT4= accessible clucene corelib dbus declarative designer \ + graphicssystems-opengl gui help iconengines \ + imageformats inputmethods multimedia network opengl \ + phonon phonon-gst qt3support qtestlib script \ + scripttools sql svg webkit xml xmlpatterns NO_BUILD= yes +OPTIONS_DEFINE= CODECS DOCS EXAMPLES NLS SQL_PLUGINS TOOLS +OPTIONS_DEFAULT=${OPTIONS_DEFINE} + +CODECS_DESC= CN, JP, KR, TW codecs support +SQL_PLUGINS_DESC= Install database plugins for QtSql +TOOLS_DESC= Install Qt tools (qmake, moc, etc.) + .include <bsd.port.options.mk> -.if !defined(WITHOUT_NLS) -USE_QT4+= l10n +.if ${PORT_OPTIONS:MCODECS} +USE_QT4+= codecs-cn codecs-jp codecs-kr codecs-tw .endif -.if defined(WITH_TOOLS) -USE_QT4+= help-tools linguist makeqpf moc pixeltool \ - porting qmake qmlviewer rcc uic uic3 qdoc3 +.if ${PORT_OPTIONS:MDOCS} +USE_QT4+= doc .endif -.if defined(WITH_CODECS) -USE_QT4+= codecs-cn codecs-jp codecs-kr codecs-tw +.if ${PORT_OPTIONS:MEXAMPLES} +USE_QT4+= demo .endif -.if defined(WITH_SQL_PLUGINS) -USE_QT4+= sql-mysql sql-odbc sql-pgsql sql-sqlite2 sql-sqlite3 +.if ${PORT_OPTIONS:MNLS} +USE_QT4+= l10n .endif -.if defined(WITH_DEMO) -USE_QT4+= demo +.if ${PORT_OPTIONS:MSQL_PLUGINS} +USE_QT4+= sql-ibase sql-mysql sql-odbc sql-pgsql sql-sqlite2 \ + sql-sqlite3 .endif -do-patch: #empty - ${DO_NADA} +.if ${PORT_OPTIONS:MTOOLS} +USE_QT4+= assistant help-tools linguist makeqpf moc pixeltool \ + porting qdbusviewer qdoc3 qmake qmlviewer qtconfig \ + qvfb rcc uic uic3 xmlpatterns-tool +.endif + +USE_QT4:= ${USE_QT4:C/$/_run/} + +do-patch: + @${DO_NADA} -do-install: #empty - ${DO_NADA} +do-install: + @${DO_NADA} .include <bsd.port.mk> diff --git a/devel/qt4/distinfo b/devel/qt4/distinfo index fbf29ccab5a5..2563b7f44ad2 100644 --- a/devel/qt4/distinfo +++ b/devel/qt4/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/qt-everywhere-opensource-src-4.8.2.tar.gz) = 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 -SIZE (KDE/qt-everywhere-opensource-src-4.8.2.tar.gz) = 239108331 +SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 +SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028 diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile index a87c26d04e2f..5d2a130427b9 100644 --- a/devel/qtcreator/Makefile +++ b/devel/qtcreator/Makefile @@ -1,24 +1,23 @@ -# New ports collection makefile for: qtcreator -# Date created: 2009-05-07 -# Whom: kris@pcbsd.org -# +# Created by: Kris Moore <kris@pcbsd.org> # $FreeBSD$ -# PORTNAME= qtcreator -PORTVERSION= 2.5.0 -PORTREVISION= 3 +DISTVERSION= 2.6.1 CATEGORIES= devel -MASTER_SITES= http://download.qt.nokia.com/qtcreator/ -DISTNAME= qt-creator-${PORTVERSION}-src +MASTER_SITES= http://releases.qt-project.org/${PORTNAME}/${DISTVERSION}/:qtcreator \ + ${MASTER_SITE_QT} +DISTNAME= qt-creator-${DISTVERSION}-src +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:qtcreator \ + ${QT_DISTNAME}.tar.gz +DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org -COMMENT= Qt Creator IDE and tools +COMMENT= C++ and QML IDE for Qt development LIB_DEPENDS= Imath:${PORTSDIR}/graphics/ilmbase \ IlmImf:${PORTSDIR}/graphics/OpenEXR \ - jasper.4:${PORTSDIR}/graphics/jasper \ - jpeg.11:${PORTSDIR}/graphics/jpeg + jasper:${PORTSDIR}/graphics/jasper \ + jpeg:${PORTSDIR}/graphics/jpeg USE_QT4= qmake_build moc_build rcc_build uic_build \ linguist_build assistant_run qt3support \ @@ -26,27 +25,38 @@ USE_QT4= qmake_build moc_build rcc_build uic_build \ sql svg xml webkit qdoc3_build HAS_CONFIGURE= yes MAKE_ENV+= INSTALL_ROOT=${PREFIX} +MAKE_JOBS_UNSAFE= yes ALL_TARGET= all docs INSTALL_TARGET= install install_docs +USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} QMAKE_ARGS= -recursive CONFIG+="configure" ${QMAKE_PRO} QMAKE_PRO= ${WRKSRC}/${PORTNAME}.pro -MAKE_JOBS_UNSAFE= yes -USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} +# Build Qt Quick Designer (requires update on every Qt update). +QT_DISTNAME= qt-everywhere-opensource-src-${QT4_VERSION} +DO_NOT_EXTRACT= config.profiles config.tests demos doc examples lib \ + mkspecs tools translations +EXTRACT_AFTER_ARGS= | ${TAR} -xf - +.for dne in ${DO_NOT_EXTRACT} +EXTRACT_AFTER_ARGS+= --exclude '${QT_DISTNAME}/${dne}' +.endfor +QMAKE_ARGS+= QT_PRIVATE_HEADERS="${WRKDIR}/${QT_DISTNAME}/include" CONFIGURE_WRKSRC= ${WRKDIR}/build BUILD_WRKSRC= ${CONFIGURE_WRKSRC} INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} -DESKTOP_ENTRIES= "Qt Creator" "${COMMENT}" "${PORTNAME}" \ - "${PORTNAME}" "" false +DESKTOP_ENTRIES= "Qt Creator" "${COMMENT}" "QtProject-qtcreator" \ + "${PREFIX}/bin/${PORTNAME}" "Development;Qt;" true post-patch: ${REINPLACE_CMD} -e 's|lrelease|lrelease-qt4|' \ ${WRKSRC}/share/qtcreator/translations/translations.pro ${REINPLACE_CMD} -e 's|lupdate|lupdate-qt4|' \ - ${WRKSRC}/share/qtcreator/translations/translations.pro + ${WRKSRC}/share/qtcreator/translations/translations.pro + ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ + ${WRKSRC}/src/plugins/android/androidsettingswidget.cpp do-configure: ${MKDIR} ${CONFIGURE_WRKSRC} diff --git a/devel/qtcreator/distinfo b/devel/qtcreator/distinfo index f94a8c684ad9..59410b1d34b4 100644 --- a/devel/qtcreator/distinfo +++ b/devel/qtcreator/distinfo @@ -1,2 +1,4 @@ -SHA256 (qt-creator-2.5.0-src.tar.gz) = e7132ca5c489b567edd9c813d56182e4bb4b0037a71112036a2fbd8a76a327fa -SIZE (qt-creator-2.5.0-src.tar.gz) = 22848008 +SHA256 (KDE/qt-creator-2.6.1-src.tar.gz) = 8031e81e5e81e398575dd90245defcd29eeaf60d5907861707d85f4325d3d215 +SIZE (KDE/qt-creator-2.6.1-src.tar.gz) = 21355916 +SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 +SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028 diff --git a/devel/qtcreator/files/patch-src-plugins-qt4projectmanager-makestep.cpp b/devel/qtcreator/files/patch-src-plugins-qt4projectmanager-makestep.cpp deleted file mode 100644 index 37ce2265b2cb..000000000000 --- a/devel/qtcreator/files/patch-src-plugins-qt4projectmanager-makestep.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- ./src/plugins/qt4projectmanager/makestep.cpp.orig 2012-05-09 12:13:19.000000000 +0000 -+++ ./src/plugins/qt4projectmanager/makestep.cpp 2012-05-10 09:13:05.254056057 +0000 -@@ -211,8 +211,10 @@ - // We also prepend "L" to the MAKEFLAGS, so that nmake / jom are less verbose - ProjectExplorer::ToolChain *toolChain = bc->toolChain(); - if (toolChain && m_makeCmd.isEmpty()) { -+#ifndef Q_OS_FREEBSD - if (toolChain->targetAbi().binaryFormat() != ProjectExplorer::Abi::PEFormat ) - Utils::QtcProcess::addArg(&args, QLatin1String("-w")); -+#endif - if (toolChain->targetAbi().os() == ProjectExplorer::Abi::WindowsOS - && toolChain->targetAbi().osFlavor() != ProjectExplorer::Abi::WindowsMSysFlavor) { - const QString makeFlags = QLatin1String("MAKEFLAGS"); diff --git a/devel/qtcreator/files/patch-src__libs__utils__savefile.cpp b/devel/qtcreator/files/patch-src__libs__utils__savefile.cpp new file mode 100644 index 000000000000..3bdf852053ac --- /dev/null +++ b/devel/qtcreator/files/patch-src__libs__utils__savefile.cpp @@ -0,0 +1,11 @@ +--- ./src/libs/utils/savefile.cpp.orig 2012-09-15 10:44:22.784493688 -0700 ++++ ./src/libs/utils/savefile.cpp 2012-09-15 10:45:06.714516257 -0700 +@@ -89,7 +89,7 @@ + } + #ifdef Q_OS_WIN + FlushFileBuffers(reinterpret_cast<HANDLE>(handle())); +-#elif defined(Q_OS_MAC) ++#elif defined(Q_OS_MAC) || defined(Q_OS_FREEBSD) + fsync(handle()); + #else + fdatasync(handle()); diff --git a/devel/qtcreator/files/patch-src__plugins__android__androidconfigurations.h b/devel/qtcreator/files/patch-src__plugins__android__androidconfigurations.h new file mode 100644 index 000000000000..048f52dac31a --- /dev/null +++ b/devel/qtcreator/files/patch-src__plugins__android__androidconfigurations.h @@ -0,0 +1,16 @@ +--- ./src/plugins/android/androidconfigurations.h.orig 2012-09-10 07:29:16.000000000 -0700 ++++ ./src/plugins/android/androidconfigurations.h 2012-09-15 16:15:01.085988267 -0700 +@@ -52,8 +52,12 @@ + # ifdef Q_OS_WIN32 + const QLatin1String ToolchainHost("windows"); + # else +-# warning No Android supported OSs found ++# ifdef Q_OS_FREEBSD ++ const QLatin1String ToolchainHost("freebsd-x86"); ++# else ++# warning No Android supported OSs found + const QLatin1String ToolchainHost("linux-x86"); ++# endif + # endif + # endif + #endif diff --git a/devel/qtcreator/files/patch-src__plugins__android__androidsettingswidget.cpp b/devel/qtcreator/files/patch-src__plugins__android__androidsettingswidget.cpp new file mode 100644 index 000000000000..ab94ad616993 --- /dev/null +++ b/devel/qtcreator/files/patch-src__plugins__android__androidsettingswidget.cpp @@ -0,0 +1,12 @@ +--- ./src/plugins/android/androidsettingswidget.cpp.orig 2012-09-10 07:29:16.000000000 -0700 ++++ ./src/plugins/android/androidsettingswidget.cpp 2012-09-15 15:10:10.396152998 -0700 +@@ -345,6 +345,9 @@ + #elif defined(Q_OS_DARWIN) + dir = QLatin1String("/opt/local/bin/ant"); + QLatin1String antApp("ant"); ++#elif defined(Q_OS_FREEBSD) ++ dir = QLatin1String("/usr/local/bin/ant"); ++ QLatin1String antApp("ant"); + #endif + const QString file = + QFileDialog::getOpenFileName(this, tr("Select ant Script"), dir, antApp); diff --git a/devel/qtcreator/files/patch-src__plugins__android__androidtoolchain.cpp b/devel/qtcreator/files/patch-src__plugins__android__androidtoolchain.cpp new file mode 100644 index 000000000000..c3d48e0e70f8 --- /dev/null +++ b/devel/qtcreator/files/patch-src__plugins__android__androidtoolchain.cpp @@ -0,0 +1,11 @@ +--- ./src/plugins/android/androidtoolchain.cpp.orig 2012-09-10 07:29:16.000000000 -0700 ++++ ./src/plugins/android/androidtoolchain.cpp 2012-09-15 15:58:23.920133451 -0700 +@@ -103,6 +103,8 @@ + "windows" + #elif defined(Q_OS_MAC) + "darwin-x86" ++#elif defined(Q_OS_FREEBSD) ++ "freebsd-x86" + #endif + ); + diff --git a/devel/qtcreator/files/patch-src__plugins__qt4projectmanager__makestep.cpp b/devel/qtcreator/files/patch-src__plugins__qt4projectmanager__makestep.cpp new file mode 100644 index 000000000000..f432f47432b7 --- /dev/null +++ b/devel/qtcreator/files/patch-src__plugins__qt4projectmanager__makestep.cpp @@ -0,0 +1,13 @@ +--- ./src/plugins/qt4projectmanager/makestep.cpp.orig 2012-09-10 07:29:16.000000000 -0700 ++++ ./src/plugins/qt4projectmanager/makestep.cpp 2012-09-15 09:10:41.176369913 -0700 +@@ -237,8 +237,10 @@ + // but for now this is the least invasive change + // We also prepend "L" to the MAKEFLAGS, so that nmake / jom are less verbose + if (tc && m_makeCmd.isEmpty()) { ++#ifndef Q_OS_FREEBSD + if (tc->targetAbi().binaryFormat() != Abi::PEFormat ) + Utils::QtcProcess::addArg(&args, QLatin1String("-w")); ++#endif + if (tc->targetAbi().os() == Abi::WindowsOS + && tc->targetAbi().osFlavor() != Abi::WindowsMSysFlavor) { + const QString makeFlags = QLatin1String("MAKEFLAGS"); diff --git a/devel/qtcreator/pkg-descr b/devel/qtcreator/pkg-descr index 43a281aea240..52cdc01a85ad 100644 --- a/devel/qtcreator/pkg-descr +++ b/devel/qtcreator/pkg-descr @@ -1,14 +1,13 @@ -Qt Creator is a new cross-platform integrated development -environment (IDE) tailored to the needs of Qt developers. +Qt Creator is a cross-platform IDE (integrated development +environment) tailored to the needs of Qt developers. +It is part of the Qt Project. It includes: + * code editor with C++, QML and ECMAscript support; + * rapid code navigation tools; + * static code checking and style hints as you type; + * context sensitive help; + * visual debugger; + * integrated GUI layout and forms designer. - * An advanced C++ code editor - * Integrated GUI layout and forms designer - * Project and build management tools - * Integrated, context-sensitive help system - * Visual debugger - * Rapid code navigation tools - * Supports multiple platforms - -WWW: http://www.qtsoftware.com/products/developer-tools +WWW: http://qt-project.org/wiki/Category:Tools::QtCreator diff --git a/devel/qtcreator/pkg-plist b/devel/qtcreator/pkg-plist index d01649272adf..22bf80fa7dce 100644 --- a/devel/qtcreator/pkg-plist +++ b/devel/qtcreator/pkg-plist @@ -1,16 +1,13 @@ -bin/qmlprofiler +bin/qmlpuppet bin/qtcreator bin/qtcreator.sh bin/qtcreator_process_stub bin/qtpromaker +bin/sdktool lib/qtcreator/libAggregation.so lib/qtcreator/libAggregation.so.1 lib/qtcreator/libAggregation.so.1.0 lib/qtcreator/libAggregation.so.1.0.0 -lib/qtcreator/libBotan.so -lib/qtcreator/libBotan.so.1 -lib/qtcreator/libBotan.so.1.0 -lib/qtcreator/libBotan.so.1.0.0 lib/qtcreator/libCPlusPlus.so lib/qtcreator/libCPlusPlus.so.1 lib/qtcreator/libCPlusPlus.so.1.0 @@ -31,6 +28,10 @@ lib/qtcreator/libLanguageUtils.so lib/qtcreator/libLanguageUtils.so.1 lib/qtcreator/libLanguageUtils.so.1.0 lib/qtcreator/libLanguageUtils.so.1.0.0 +lib/qtcreator/libQmlDebug.so +lib/qtcreator/libQmlDebug.so.1 +lib/qtcreator/libQmlDebug.so.1.0 +lib/qtcreator/libQmlDebug.so.1.0.0 lib/qtcreator/libQmlEditorWidgets.so lib/qtcreator/libQmlEditorWidgets.so.1 lib/qtcreator/libQmlEditorWidgets.so.1.0 @@ -39,112 +40,119 @@ lib/qtcreator/libQmlJS.so lib/qtcreator/libQmlJS.so.1 lib/qtcreator/libQmlJS.so.1.0 lib/qtcreator/libQmlJS.so.1.0.0 -lib/qtcreator/libQmlJSDebugClient.so -lib/qtcreator/libQmlJSDebugClient.so.1 -lib/qtcreator/libQmlJSDebugClient.so.1.0 -lib/qtcreator/libQmlJSDebugClient.so.1.0.0 +lib/qtcreator/libQtcSsh.so +lib/qtcreator/libQtcSsh.so.1 +lib/qtcreator/libQtcSsh.so.1.0 +lib/qtcreator/libQtcSsh.so.1.0.0 lib/qtcreator/libUtils.so lib/qtcreator/libUtils.so.1 lib/qtcreator/libUtils.so.1.0 lib/qtcreator/libUtils.so.1.0.0 -lib/qtcreator/libsymbianutils.so -lib/qtcreator/libsymbianutils.so.1 -lib/qtcreator/libsymbianutils.so.1.0 -lib/qtcreator/libsymbianutils.so.1.0.0 lib/qtcreator/libzeroconf.so lib/qtcreator/libzeroconf.so.1 lib/qtcreator/libzeroconf.so.1.0 lib/qtcreator/libzeroconf.so.1.0.0 -lib/qtcreator/plugins/Nokia/AnalyzerBase.pluginspec -lib/qtcreator/plugins/Nokia/AutotoolsProjectManager.pluginspec -lib/qtcreator/plugins/Nokia/Bazaar.pluginspec -lib/qtcreator/plugins/Nokia/BinEditor.pluginspec -lib/qtcreator/plugins/Nokia/Bookmarks.pluginspec -lib/qtcreator/plugins/Nokia/CMakeProjectManager.pluginspec -lib/qtcreator/plugins/Nokia/CVS.pluginspec -lib/qtcreator/plugins/Nokia/ClassView.pluginspec -lib/qtcreator/plugins/Nokia/CodePaster.pluginspec -lib/qtcreator/plugins/Nokia/Core.pluginspec -lib/qtcreator/plugins/Nokia/CppEditor.pluginspec -lib/qtcreator/plugins/Nokia/CppTools.pluginspec -lib/qtcreator/plugins/Nokia/Debugger.pluginspec -lib/qtcreator/plugins/Nokia/Designer.pluginspec -lib/qtcreator/plugins/Nokia/FakeVim.pluginspec -lib/qtcreator/plugins/Nokia/Find.pluginspec -lib/qtcreator/plugins/Nokia/GLSLEditor.pluginspec -lib/qtcreator/plugins/Nokia/GenericProjectManager.pluginspec -lib/qtcreator/plugins/Nokia/Git.pluginspec -lib/qtcreator/plugins/Nokia/HelloWorld.pluginspec -lib/qtcreator/plugins/Nokia/Help.pluginspec -lib/qtcreator/plugins/Nokia/ImageViewer.pluginspec -lib/qtcreator/plugins/Nokia/Locator.pluginspec -lib/qtcreator/plugins/Nokia/Macros.pluginspec -lib/qtcreator/plugins/Nokia/Madde.pluginspec -lib/qtcreator/plugins/Nokia/Mercurial.pluginspec -lib/qtcreator/plugins/Nokia/Perforce.pluginspec -lib/qtcreator/plugins/Nokia/ProjectExplorer.pluginspec -lib/qtcreator/plugins/Nokia/QmlJSEditor.pluginspec -lib/qtcreator/plugins/Nokia/QmlJSInspector.pluginspec -lib/qtcreator/plugins/Nokia/QmlJSTools.pluginspec -lib/qtcreator/plugins/Nokia/QmlProfiler.pluginspec -lib/qtcreator/plugins/Nokia/QmlProjectManager.pluginspec -lib/qtcreator/plugins/Nokia/Qt4ProjectManager.pluginspec -lib/qtcreator/plugins/Nokia/QtSupport.pluginspec -lib/qtcreator/plugins/Nokia/RemoteLinux.pluginspec -lib/qtcreator/plugins/Nokia/ResourceEditor.pluginspec -lib/qtcreator/plugins/Nokia/Subversion.pluginspec -lib/qtcreator/plugins/Nokia/TaskList.pluginspec -lib/qtcreator/plugins/Nokia/TextEditor.pluginspec -lib/qtcreator/plugins/Nokia/Todo.pluginspec -lib/qtcreator/plugins/Nokia/UpdateInfo.pluginspec -lib/qtcreator/plugins/Nokia/Valgrind.pluginspec -lib/qtcreator/plugins/Nokia/VcsBase.pluginspec -lib/qtcreator/plugins/Nokia/Welcome.pluginspec -lib/qtcreator/plugins/Nokia/libAnalyzerBase.so -lib/qtcreator/plugins/Nokia/libAutotoolsProjectManager.so -lib/qtcreator/plugins/Nokia/libBazaar.so -lib/qtcreator/plugins/Nokia/libBinEditor.so -lib/qtcreator/plugins/Nokia/libBookmarks.so -lib/qtcreator/plugins/Nokia/libCMakeProjectManager.so -lib/qtcreator/plugins/Nokia/libCVS.so -lib/qtcreator/plugins/Nokia/libClassView.so -lib/qtcreator/plugins/Nokia/libCodePaster.so -lib/qtcreator/plugins/Nokia/libCore.so -lib/qtcreator/plugins/Nokia/libCppEditor.so -lib/qtcreator/plugins/Nokia/libCppTools.so -lib/qtcreator/plugins/Nokia/libDebugger.so -lib/qtcreator/plugins/Nokia/libDesigner.so -lib/qtcreator/plugins/Nokia/libFakeVim.so -lib/qtcreator/plugins/Nokia/libFind.so -lib/qtcreator/plugins/Nokia/libGLSLEditor.so -lib/qtcreator/plugins/Nokia/libGenericProjectManager.so -lib/qtcreator/plugins/Nokia/libGit.so -lib/qtcreator/plugins/Nokia/libHelloWorld.so -lib/qtcreator/plugins/Nokia/libHelp.so -lib/qtcreator/plugins/Nokia/libImageViewer.so -lib/qtcreator/plugins/Nokia/libLocator.so -lib/qtcreator/plugins/Nokia/libMacros.so -lib/qtcreator/plugins/Nokia/libMadde.so -lib/qtcreator/plugins/Nokia/libMercurial.so -lib/qtcreator/plugins/Nokia/libPerforce.so -lib/qtcreator/plugins/Nokia/libProjectExplorer.so -lib/qtcreator/plugins/Nokia/libQmlJSEditor.so -lib/qtcreator/plugins/Nokia/libQmlJSInspector.so -lib/qtcreator/plugins/Nokia/libQmlJSTools.so -lib/qtcreator/plugins/Nokia/libQmlProfiler.so -lib/qtcreator/plugins/Nokia/libQmlProjectManager.so -lib/qtcreator/plugins/Nokia/libQt4ProjectManager.so -lib/qtcreator/plugins/Nokia/libQtSupport.so -lib/qtcreator/plugins/Nokia/libRemoteLinux.so -lib/qtcreator/plugins/Nokia/libResourceEditor.so -lib/qtcreator/plugins/Nokia/libSubversion.so -lib/qtcreator/plugins/Nokia/libTaskList.so -lib/qtcreator/plugins/Nokia/libTextEditor.so -lib/qtcreator/plugins/Nokia/libTodo.so -lib/qtcreator/plugins/Nokia/libUpdateInfo.so -lib/qtcreator/plugins/Nokia/libValgrind.so -lib/qtcreator/plugins/Nokia/libVcsBase.so -lib/qtcreator/plugins/Nokia/libWelcome.so +lib/qtcreator/plugins/QtProject/AnalyzerBase.pluginspec +lib/qtcreator/plugins/QtProject/Android.pluginspec +lib/qtcreator/plugins/QtProject/AutotoolsProjectManager.pluginspec +lib/qtcreator/plugins/QtProject/Bazaar.pluginspec +lib/qtcreator/plugins/QtProject/BinEditor.pluginspec +lib/qtcreator/plugins/QtProject/Bookmarks.pluginspec +lib/qtcreator/plugins/QtProject/CMakeProjectManager.pluginspec +lib/qtcreator/plugins/QtProject/CVS.pluginspec +lib/qtcreator/plugins/QtProject/ClassView.pluginspec +lib/qtcreator/plugins/QtProject/ClearCase.pluginspec +lib/qtcreator/plugins/QtProject/CodePaster.pluginspec +lib/qtcreator/plugins/QtProject/Core.pluginspec +lib/qtcreator/plugins/QtProject/CppEditor.pluginspec +lib/qtcreator/plugins/QtProject/CppTools.pluginspec +lib/qtcreator/plugins/QtProject/Debugger.pluginspec +lib/qtcreator/plugins/QtProject/Designer.pluginspec +lib/qtcreator/plugins/QtProject/FakeVim.pluginspec +lib/qtcreator/plugins/QtProject/Find.pluginspec +lib/qtcreator/plugins/QtProject/GLSLEditor.pluginspec +lib/qtcreator/plugins/QtProject/GenericProjectManager.pluginspec +lib/qtcreator/plugins/QtProject/Git.pluginspec +lib/qtcreator/plugins/QtProject/HelloWorld.pluginspec +lib/qtcreator/plugins/QtProject/Help.pluginspec +lib/qtcreator/plugins/QtProject/ImageViewer.pluginspec +lib/qtcreator/plugins/QtProject/Locator.pluginspec +lib/qtcreator/plugins/QtProject/Macros.pluginspec +lib/qtcreator/plugins/QtProject/Madde.pluginspec +lib/qtcreator/plugins/QtProject/Mercurial.pluginspec +lib/qtcreator/plugins/QtProject/Perforce.pluginspec +lib/qtcreator/plugins/QtProject/ProjectExplorer.pluginspec +lib/qtcreator/plugins/QtProject/QmlDesigner.pluginspec +lib/qtcreator/plugins/QtProject/QmlJSEditor.pluginspec +lib/qtcreator/plugins/QtProject/QmlJSTools.pluginspec +lib/qtcreator/plugins/QtProject/QmlProfiler.pluginspec +lib/qtcreator/plugins/QtProject/QmlProjectManager.pluginspec +lib/qtcreator/plugins/QtProject/Qt4ProjectManager.pluginspec +lib/qtcreator/plugins/QtProject/QtSupport.pluginspec +lib/qtcreator/plugins/QtProject/RemoteLinux.pluginspec +lib/qtcreator/plugins/QtProject/ResourceEditor.pluginspec +lib/qtcreator/plugins/QtProject/Subversion.pluginspec +lib/qtcreator/plugins/QtProject/TaskList.pluginspec +lib/qtcreator/plugins/QtProject/TextEditor.pluginspec +lib/qtcreator/plugins/QtProject/Todo.pluginspec +lib/qtcreator/plugins/QtProject/UpdateInfo.pluginspec +lib/qtcreator/plugins/QtProject/Valgrind.pluginspec +lib/qtcreator/plugins/QtProject/VcsBase.pluginspec +lib/qtcreator/plugins/QtProject/Welcome.pluginspec +lib/qtcreator/plugins/QtProject/libAnalyzerBase.so +lib/qtcreator/plugins/QtProject/libAndroid.so +lib/qtcreator/plugins/QtProject/libAutotoolsProjectManager.so +lib/qtcreator/plugins/QtProject/libBazaar.so +lib/qtcreator/plugins/QtProject/libBinEditor.so +lib/qtcreator/plugins/QtProject/libBookmarks.so +lib/qtcreator/plugins/QtProject/libCMakeProjectManager.so +lib/qtcreator/plugins/QtProject/libCVS.so +lib/qtcreator/plugins/QtProject/libClassView.so +lib/qtcreator/plugins/QtProject/libClearCase.so +lib/qtcreator/plugins/QtProject/libCodePaster.so +lib/qtcreator/plugins/QtProject/libCore.so +lib/qtcreator/plugins/QtProject/libCppEditor.so +lib/qtcreator/plugins/QtProject/libCppTools.so +lib/qtcreator/plugins/QtProject/libDebugger.so +lib/qtcreator/plugins/QtProject/libDesigner.so +lib/qtcreator/plugins/QtProject/libFakeVim.so +lib/qtcreator/plugins/QtProject/libFind.so +lib/qtcreator/plugins/QtProject/libGLSLEditor.so +lib/qtcreator/plugins/QtProject/libGenericProjectManager.so +lib/qtcreator/plugins/QtProject/libGit.so +lib/qtcreator/plugins/QtProject/libHelloWorld.so +lib/qtcreator/plugins/QtProject/libHelp.so +lib/qtcreator/plugins/QtProject/libImageViewer.so +lib/qtcreator/plugins/QtProject/libLocator.so +lib/qtcreator/plugins/QtProject/libMacros.so +lib/qtcreator/plugins/QtProject/libMadde.so +lib/qtcreator/plugins/QtProject/libMercurial.so +lib/qtcreator/plugins/QtProject/libPerforce.so +lib/qtcreator/plugins/QtProject/libProjectExplorer.so +lib/qtcreator/plugins/QtProject/libQmlDesigner.so +lib/qtcreator/plugins/QtProject/libQmlJSEditor.so +lib/qtcreator/plugins/QtProject/libQmlJSTools.so +lib/qtcreator/plugins/QtProject/libQmlProfiler.so +lib/qtcreator/plugins/QtProject/libQmlProjectManager.so +lib/qtcreator/plugins/QtProject/libQt4ProjectManager.so +lib/qtcreator/plugins/QtProject/libQtSupport.so +lib/qtcreator/plugins/QtProject/libRemoteLinux.so +lib/qtcreator/plugins/QtProject/libResourceEditor.so +lib/qtcreator/plugins/QtProject/libSubversion.so +lib/qtcreator/plugins/QtProject/libTaskList.so +lib/qtcreator/plugins/QtProject/libTextEditor.so +lib/qtcreator/plugins/QtProject/libTodo.so +lib/qtcreator/plugins/QtProject/libUpdateInfo.so +lib/qtcreator/plugins/QtProject/libValgrind.so +lib/qtcreator/plugins/QtProject/libVcsBase.so +lib/qtcreator/plugins/QtProject/libWelcome.so +lib/qtcreator/plugins/RIM/Qnx.pluginspec +lib/qtcreator/plugins/RIM/libQnx.so +lib/qtcreator/qmldesigner/libcustomstyleplugin.so +lib/qtcreator/qmldesigner/libdesktopplugin.so +lib/qtcreator/qmldesigner/libextrasplugin.so +lib/qtcreator/qmldesigner/libmeegoplugin.so +lib/qtcreator/qmldesigner/libqtquickplugin.so lib/qtcreator/qtcomponents/Button.qml lib/qtcreator/qtcomponents/ButtonRow.qml lib/qtcreator/qtcomponents/CheckBox.qml @@ -195,14 +203,14 @@ lib/qtcreator/qtcomponents/plugin/libstyleplugin.so lib/qtcreator/qtcomponents/qmldir share/doc/qtcreator/qtcreator-dev.qch share/doc/qtcreator/qtcreator.qch -share/icons/hicolor/128x128/apps/qtcreator.png -share/icons/hicolor/16x16/apps/qtcreator.png -share/icons/hicolor/24x24/apps/qtcreator.png -share/icons/hicolor/256x256/apps/qtcreator.png -share/icons/hicolor/32x32/apps/qtcreator.png -share/icons/hicolor/48x48/apps/qtcreator.png -share/icons/hicolor/512x512/apps/qtcreator.png -share/icons/hicolor/64x64/apps/qtcreator.png +share/icons/hicolor/128x128/apps/QtProject-qtcreator.png +share/icons/hicolor/16x16/apps/QtProject-qtcreator.png +share/icons/hicolor/24x24/apps/QtProject-qtcreator.png +share/icons/hicolor/256x256/apps/QtProject-qtcreator.png +share/icons/hicolor/32x32/apps/QtProject-qtcreator.png +share/icons/hicolor/48x48/apps/QtProject-qtcreator.png +share/icons/hicolor/512x512/apps/QtProject-qtcreator.png +share/icons/hicolor/64x64/apps/QtProject-qtcreator.png share/qtcreator/designer/templates.xml share/qtcreator/designer/templates/Dialog_with_Buttons_Bottom.ui share/qtcreator/designer/templates/Dialog_with_Buttons_Right.ui @@ -223,6 +231,7 @@ share/qtcreator/dumper/test/dumpertest.pro share/qtcreator/dumper/test/main.cpp share/qtcreator/externaltools/lrelease.xml share/qtcreator/externaltools/lupdate.xml +share/qtcreator/externaltools/qmlscene.xml share/qtcreator/externaltools/qmlviewer.xml share/qtcreator/externaltools/sort.xml share/qtcreator/externaltools/vi.xml @@ -740,13 +749,17 @@ share/qtcreator/templates/qt4project/mywidget.h share/qtcreator/templates/qt4project/mywidget_form.cpp share/qtcreator/templates/qt4project/mywidget_form.h share/qtcreator/templates/qt4project/widget.ui +share/qtcreator/templates/qtquick2app/app.pro +share/qtcreator/templates/qtquick2app/main.cpp +share/qtcreator/templates/qtquick2app/qml/app/qtquick20/main.qml +share/qtcreator/templates/qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.cpp +share/qtcreator/templates/qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.h +share/qtcreator/templates/qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.pri share/qtcreator/templates/qtquickapp/app.pro share/qtcreator/templates/qtquickapp/main.cpp share/qtcreator/templates/qtquickapp/qml/app/meego10/MainPage.qml share/qtcreator/templates/qtquickapp/qml/app/meego10/main.qml share/qtcreator/templates/qtquickapp/qml/app/qtquick10/main.qml -share/qtcreator/templates/qtquickapp/qml/app/symbian11/MainPage.qml -share/qtcreator/templates/qtquickapp/qml/app/symbian11/main.qml share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.h share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.pri @@ -755,8 +768,39 @@ share/qtcreator/templates/shared/deployment.pri share/qtcreator/templates/shared/icon64.png share/qtcreator/templates/shared/icon80.png share/qtcreator/templates/shared/manifest.aegis -share/qtcreator/templates/shared/symbianicon.svg share/qtcreator/templates/wizards/README.txt +share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml +share/qtcreator/templates/wizards/bb-bardescriptor/wizard.xml +share/qtcreator/templates/wizards/bb-guiapp/bar-descriptor.xml +share/qtcreator/templates/wizards/bb-guiapp/icon.png +share/qtcreator/templates/wizards/bb-guiapp/main.cpp +share/qtcreator/templates/wizards/bb-guiapp/mainwidget.cpp +share/qtcreator/templates/wizards/bb-guiapp/mainwidget.h +share/qtcreator/templates/wizards/bb-guiapp/mainwidget.ui +share/qtcreator/templates/wizards/bb-guiapp/project.pro +share/qtcreator/templates/wizards/bb-guiapp/wizard.xml +share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml +share/qtcreator/templates/wizards/bb-qt5-bardescriptor/wizard.xml +share/qtcreator/templates/wizards/bb-qt5-guiapp/bar-descriptor.xml +share/qtcreator/templates/wizards/bb-qt5-guiapp/icon.png +share/qtcreator/templates/wizards/bb-qt5-guiapp/main.cpp +share/qtcreator/templates/wizards/bb-qt5-guiapp/mainwidget.cpp +share/qtcreator/templates/wizards/bb-qt5-guiapp/mainwidget.h +share/qtcreator/templates/wizards/bb-qt5-guiapp/mainwidget.ui +share/qtcreator/templates/wizards/bb-qt5-guiapp/project.pro +share/qtcreator/templates/wizards/bb-qt5-guiapp/wizard.xml +share/qtcreator/templates/wizards/bb-qt5-quick2app/bar-descriptor.xml +share/qtcreator/templates/wizards/bb-qt5-quick2app/icon.png +share/qtcreator/templates/wizards/bb-qt5-quick2app/main.cpp +share/qtcreator/templates/wizards/bb-qt5-quick2app/project.pro +share/qtcreator/templates/wizards/bb-qt5-quick2app/qml/main.qml +share/qtcreator/templates/wizards/bb-qt5-quick2app/wizard.xml +share/qtcreator/templates/wizards/bb-quickapp/bar-descriptor.xml +share/qtcreator/templates/wizards/bb-quickapp/icon.png +share/qtcreator/templates/wizards/bb-quickapp/main.cpp +share/qtcreator/templates/wizards/bb-quickapp/project.pro +share/qtcreator/templates/wizards/bb-quickapp/qml/main.qml +share/qtcreator/templates/wizards/bb-quickapp/wizard.xml share/qtcreator/templates/wizards/helloworld/console.png share/qtcreator/templates/wizards/helloworld/main.cpp share/qtcreator/templates/wizards/helloworld/project.pro @@ -780,14 +824,6 @@ share/qtcreator/templates/wizards/plaincppapp/console.png share/qtcreator/templates/wizards/plaincppapp/main.cpp share/qtcreator/templates/wizards/plaincppapp/project.pro share/qtcreator/templates/wizards/plaincppapp/wizard.xml -share/qtcreator/templates/wizards/qml-extension/lib.png -share/qtcreator/templates/wizards/qml-extension/object.cpp -share/qtcreator/templates/wizards/qml-extension/object.h -share/qtcreator/templates/wizards/qml-extension/plugin.cpp -share/qtcreator/templates/wizards/qml-extension/plugin.h -share/qtcreator/templates/wizards/qml-extension/project.pro -share/qtcreator/templates/wizards/qml-extension/qmldir -share/qtcreator/templates/wizards/qml-extension/wizard.xml share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec.in share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.h @@ -796,6 +832,22 @@ share/qtcreator/templates/wizards/qtcreatorplugin/myplugin_global.h share/qtcreator/templates/wizards/qtcreatorplugin/mypluginconstants.h share/qtcreator/templates/wizards/qtcreatorplugin/qtcreator_logo_24.png share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml +share/qtcreator/templates/wizards/qtquick1-extension/lib.png +share/qtcreator/templates/wizards/qtquick1-extension/object.cpp +share/qtcreator/templates/wizards/qtquick1-extension/object.h +share/qtcreator/templates/wizards/qtquick1-extension/plugin.cpp +share/qtcreator/templates/wizards/qtquick1-extension/plugin.h +share/qtcreator/templates/wizards/qtquick1-extension/project.pro +share/qtcreator/templates/wizards/qtquick1-extension/qmldir +share/qtcreator/templates/wizards/qtquick1-extension/wizard.xml +share/qtcreator/templates/wizards/qtquick2-extension/lib.png +share/qtcreator/templates/wizards/qtquick2-extension/object.cpp +share/qtcreator/templates/wizards/qtquick2-extension/object.h +share/qtcreator/templates/wizards/qtquick2-extension/plugin.cpp +share/qtcreator/templates/wizards/qtquick2-extension/plugin.h +share/qtcreator/templates/wizards/qtquick2-extension/project.pro +share/qtcreator/templates/wizards/qtquick2-extension/qmldir +share/qtcreator/templates/wizards/qtquick2-extension/wizard.xml share/qtcreator/templates/wizards/scriptgeneratedproject/generate.pl share/qtcreator/templates/wizards/scriptgeneratedproject/wizard_sample.xml share/qtcreator/translations/qtcreator_cs.qm @@ -806,6 +858,7 @@ share/qtcreator/translations/qtcreator_pl.qm share/qtcreator/translations/qtcreator_ru.qm share/qtcreator/translations/qtcreator_sl.qm share/qtcreator/translations/qtcreator_zh_CN.qm +share/qtcreator/translations/qtcreator_zh_TW.qm share/qtcreator/welcomescreen/develop.qml share/qtcreator/welcomescreen/dummydata/examplesModel.qml share/qtcreator/welcomescreen/dummydata/pagesModel.qml @@ -825,8 +878,8 @@ share/qtcreator/welcomescreen/widgets/CustomFonts.qml share/qtcreator/welcomescreen/widgets/CustomTab.qml share/qtcreator/welcomescreen/widgets/CustomizedGridView.qml share/qtcreator/welcomescreen/widgets/Delegate.qml -share/qtcreator/welcomescreen/widgets/Feedback.qml share/qtcreator/welcomescreen/widgets/GettingStartedItem.qml +share/qtcreator/welcomescreen/widgets/IconAndLink.qml share/qtcreator/welcomescreen/widgets/LinkedText.qml share/qtcreator/welcomescreen/widgets/LinksBar.qml share/qtcreator/welcomescreen/widgets/Logo.qml @@ -862,6 +915,7 @@ share/qtcreator/welcomescreen/widgets/images/icons/createIcon.png share/qtcreator/welcomescreen/widgets/images/icons/ddays09.png share/qtcreator/welcomescreen/widgets/images/icons/ddays10.png share/qtcreator/welcomescreen/widgets/images/icons/ddays11.png +share/qtcreator/welcomescreen/widgets/images/icons/ddays12.png share/qtcreator/welcomescreen/widgets/images/icons/delete.png share/qtcreator/welcomescreen/widgets/images/icons/developing_with_qt_creator.png share/qtcreator/welcomescreen/widgets/images/icons/feedbackIcon.png @@ -892,6 +946,7 @@ share/qtcreator/welcomescreen/widgets/images/mockup/thread-examples.png share/qtcreator/welcomescreen/widgets/images/more.png share/qtcreator/welcomescreen/widgets/images/qtcreator.png share/qtcreator/welcomescreen/widgets/images/tab.png +share/qtcreator/welcomescreen/widgets/qmldir @dirrm share/qtcreator/welcomescreen/widgets/images/mockup @dirrm share/qtcreator/welcomescreen/widgets/images/icons @dirrm share/qtcreator/welcomescreen/widgets/images @@ -902,6 +957,8 @@ share/qtcreator/welcomescreen/widgets/images/tab.png @dirrm share/qtcreator/welcomescreen @dirrm share/qtcreator/translations @dirrm share/qtcreator/templates/wizards/scriptgeneratedproject +@dirrm share/qtcreator/templates/wizards/qtquick2-extension +@dirrm share/qtcreator/templates/wizards/qtquick1-extension @dirrm share/qtcreator/templates/wizards/qtcreatorplugin @dirrm share/qtcreator/templates/wizards/qml-extension @dirrm share/qtcreator/templates/wizards/plaincppapp-cmake @@ -910,15 +967,27 @@ share/qtcreator/welcomescreen/widgets/images/tab.png @dirrm share/qtcreator/templates/wizards/plaincapp @dirrm share/qtcreator/templates/wizards/listmodel @dirrm share/qtcreator/templates/wizards/helloworld +@dirrm share/qtcreator/templates/wizards/bb-quickapp/qml +@dirrm share/qtcreator/templates/wizards/bb-quickapp +@dirrm share/qtcreator/templates/wizards/bb-qt5-quick2app/qml +@dirrm share/qtcreator/templates/wizards/bb-qt5-quick2app +@dirrm share/qtcreator/templates/wizards/bb-qt5-guiapp +@dirrm share/qtcreator/templates/wizards/bb-qt5-bardescriptor +@dirrm share/qtcreator/templates/wizards/bb-guiapp +@dirrm share/qtcreator/templates/wizards/bb-bardescriptor @dirrm share/qtcreator/templates/wizards @dirrm share/qtcreator/templates/shared @dirrm share/qtcreator/templates/qtquickapp/qmlapplicationviewer -@dirrm share/qtcreator/templates/qtquickapp/qml/app/symbian11 @dirrm share/qtcreator/templates/qtquickapp/qml/app/qtquick10 @dirrm share/qtcreator/templates/qtquickapp/qml/app/meego10 @dirrm share/qtcreator/templates/qtquickapp/qml/app @dirrm share/qtcreator/templates/qtquickapp/qml @dirrm share/qtcreator/templates/qtquickapp +@dirrm share/qtcreator/templates/qtquick2app/qtquick2applicationviewer +@dirrm share/qtcreator/templates/qtquick2app/qml/app/qtquick20 +@dirrm share/qtcreator/templates/qtquick2app/qml/app +@dirrm share/qtcreator/templates/qtquick2app/qml +@dirrm share/qtcreator/templates/qtquick2app @dirrm share/qtcreator/templates/qt4project/customwidgetwizard @dirrm share/qtcreator/templates/qt4project @dirrm share/qtcreator/templates/mobileapp @@ -996,6 +1065,8 @@ share/qtcreator/welcomescreen/widgets/images/tab.png @dirrm lib/qtcreator/qtcomponents/custom/behaviors @dirrm lib/qtcreator/qtcomponents/custom @dirrm lib/qtcreator/qtcomponents -@dirrm lib/qtcreator/plugins/Nokia +@dirrm lib/qtcreator/qmldesigner +@dirrm lib/qtcreator/plugins/RIM +@dirrm lib/qtcreator/plugins/QtProject @dirrm lib/qtcreator/plugins @dirrm lib/qtcreator diff --git a/graphics/qt4-iconengines/Makefile b/graphics/qt4-iconengines/Makefile index 066a1059ec88..91241a2fc7e3 100644 --- a/graphics/qt4-iconengines/Makefile +++ b/graphics/qt4-iconengines/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= iconengines DISTVERSION= ${QT4_VERSION} diff --git a/graphics/qt4-imageformats/Makefile b/graphics/qt4-imageformats/Makefile index d46278737333..6e6247334bc0 100644 --- a/graphics/qt4-imageformats/Makefile +++ b/graphics/qt4-imageformats/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= imageformats DISTVERSION= ${QT4_VERSION} @@ -12,7 +7,7 @@ CATEGORIES?= graphics PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org -COMMENT= Qt imageformat plugins for GIF, JPEG, MNG, and SVG +COMMENT= Qt imageformat plugins for GIF, JPEG, MNG and SVG LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ mng:${PORTSDIR}/graphics/libmng \ diff --git a/graphics/qt4-pixeltool/Makefile b/graphics/qt4-pixeltool/Makefile index 3896030d0138..015f0e27771d 100644 --- a/graphics/qt4-pixeltool/Makefile +++ b/graphics/qt4-pixeltool/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= pixeltool DISTVERSION= ${QT4_VERSION} @@ -26,6 +21,11 @@ CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH +# qtlogo.png is installed by qt4-gui +DESKTOP_ENTRIES="Qt PixelTool" "${COMMENT}" \ + "${LOCALBASE}/share/pixmaps/qtlogo.png" \ + "${PREFIX}/bin/pixeltool" "Graphics;Qt;" true + DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/dbus src/multimedia src/network src/opengl \ src/openvg src/phonon src/qt3support src/s60installs \ diff --git a/graphics/qt4-svg/Makefile b/graphics/qt4-svg/Makefile index f4088c43e930..d5eb24830a1e 100644 --- a/graphics/qt4-svg/Makefile +++ b/graphics/qt4-svg/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= svg DISTVERSION= ${QT4_VERSION} diff --git a/japanese/qt4-codecs-jp/Makefile b/japanese/qt4-codecs-jp/Makefile index 4a362a97400f..bc9c0da95825 100644 --- a/japanese/qt4-codecs-jp/Makefile +++ b/japanese/qt4-codecs-jp/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= codecs DISTVERSION= ${QT4_VERSION} diff --git a/korean/qt4-codecs-kr/Makefile b/korean/qt4-codecs-kr/Makefile index 9bca995e1126..c769bdf354f9 100644 --- a/korean/qt4-codecs-kr/Makefile +++ b/korean/qt4-codecs-kr/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= codecs DISTVERSION= ${QT4_VERSION} diff --git a/misc/qt4-doc/Makefile b/misc/qt4-doc/Makefile index badacdac78f3..cf8941749986 100644 --- a/misc/qt4-doc/Makefile +++ b/misc/qt4-doc/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= doc DISTVERSION= ${QT4_VERSION} diff --git a/misc/qt4-doc/pkg-plist b/misc/qt4-doc/pkg-plist index 17ce1bc873bb..019444ff3693 100644 --- a/misc/qt4-doc/pkg-plist +++ b/misc/qt4-doc/pkg-plist @@ -820,6 +820,7 @@ %%DOCSDIR%%/html/declarative-ui-components-slideswitch-slideswitch-svg.html %%DOCSDIR%%/html/declarative-ui-components-slideswitch.html %%DOCSDIR%%/html/declarative-ui-components-spinner-main-cpp.html +%%DOCSDIR%%/html/declarative-ui-components-spinner-qml-spinner-content-spinner-qml.html %%DOCSDIR%%/html/declarative-ui-components-spinner-qml-spinner-main-qml.html %%DOCSDIR%%/html/declarative-ui-components-spinner-spinner-pro.html %%DOCSDIR%%/html/declarative-ui-components-spinner-spinner-qmlproject.html @@ -1894,7 +1895,6 @@ %%DOCSDIR%%/html/images/appicon_screenshot.png %%DOCSDIR%%/html/images/application-menus.png %%DOCSDIR%%/html/images/application.png -%%DOCSDIR%%/html/images/arrow_bc.png %%DOCSDIR%%/html/images/arrow_down.png %%DOCSDIR%%/html/images/arthurplugin-demo.png %%DOCSDIR%%/html/images/assistant-address-toolbar.png @@ -1920,12 +1920,16 @@ %%DOCSDIR%%/html/images/bearercloud-example.png %%DOCSDIR%%/html/images/bearermonitor-example.png %%DOCSDIR%%/html/images/bearings.png -%%DOCSDIR%%/html/images/bgrContent.png +%%DOCSDIR%%/html/images/bg_l.png +%%DOCSDIR%%/html/images/bg_l_blank.png +%%DOCSDIR%%/html/images/bg_ll_blank.png +%%DOCSDIR%%/html/images/bg_r.png +%%DOCSDIR%%/html/images/bg_ul_blank.png %%DOCSDIR%%/html/images/blockingfortuneclient-example.png -%%DOCSDIR%%/html/images/blu_dot.png %%DOCSDIR%%/html/images/blurpickereffect-example.png %%DOCSDIR%%/html/images/books-demo.png %%DOCSDIR%%/html/images/borderlayout-example.png +%%DOCSDIR%%/html/images/box_bg.png %%DOCSDIR%%/html/images/boxes-demo.png %%DOCSDIR%%/html/images/branchindicatorimage.png %%DOCSDIR%%/html/images/breadcrumb.png @@ -1934,8 +1938,8 @@ %%DOCSDIR%%/html/images/browser-demo.png %%DOCSDIR%%/html/images/brush-outline.png %%DOCSDIR%%/html/images/brush-styles.png -%%DOCSDIR%%/html/images/btn_next.png -%%DOCSDIR%%/html/images/btn_prev.png +%%DOCSDIR%%/html/images/btn_next_green.png +%%DOCSDIR%%/html/images/btn_prev_green.png %%DOCSDIR%%/html/images/bullet_dn.png %%DOCSDIR%%/html/images/bullet_gt.png %%DOCSDIR%%/html/images/bullet_sq.png @@ -2289,6 +2293,7 @@ %%DOCSDIR%%/html/images/fademessageeffect-example-faded.png %%DOCSDIR%%/html/images/fademessageeffect-example.png %%DOCSDIR%%/html/images/fancybrowser-example.png +%%DOCSDIR%%/html/images/feedbackground.png %%DOCSDIR%%/html/images/fetchmore-example.png %%DOCSDIR%%/html/images/filedialogurls.png %%DOCSDIR%%/html/images/filetree_1-example.png @@ -2382,19 +2387,16 @@ %%DOCSDIR%%/html/images/gtk-toolbutton.png %%DOCSDIR%%/html/images/gtk-treeview.png %%DOCSDIR%%/html/images/header.png +%%DOCSDIR%%/html/images/header_bg.png %%DOCSDIR%%/html/images/headerimage.png %%DOCSDIR%%/html/images/hellogl-es-example.png %%DOCSDIR%%/html/images/hellogl-example.png -%%DOCSDIR%%/html/images/home.png %%DOCSDIR%%/html/images/horBar.png %%DOCSDIR%%/html/images/horizontalpositioner_example.png %%DOCSDIR%%/html/images/hoverevents.png %%DOCSDIR%%/html/images/http-example.png %%DOCSDIR%%/html/images/httpstack.png %%DOCSDIR%%/html/images/i18n-example.png -%%DOCSDIR%%/html/images/ico_note.png -%%DOCSDIR%%/html/images/ico_note_attention.png -%%DOCSDIR%%/html/images/ico_out.png %%DOCSDIR%%/html/images/icon.png %%DOCSDIR%%/html/images/icons-example.png %%DOCSDIR%%/html/images/icons-view-menu.png @@ -2626,6 +2628,8 @@ %%DOCSDIR%%/html/images/orientation-portrait.png %%DOCSDIR%%/html/images/overpainting-example.png %%DOCSDIR%%/html/images/padnavigator-example.png +%%DOCSDIR%%/html/images/page.png +%%DOCSDIR%%/html/images/page_bg.png %%DOCSDIR%%/html/images/painterpaths-example.png %%DOCSDIR%%/html/images/painting-examples.png %%DOCSDIR%%/html/images/paintsystem-antialiasing.png @@ -3197,6 +3201,7 @@ %%DOCSDIR%%/html/images/spinboxdelegate-example.png %%DOCSDIR%%/html/images/spinboxes-example.png %%DOCSDIR%%/html/images/spinboximage.png +%%DOCSDIR%%/html/images/spinner.gif %%DOCSDIR%%/html/images/spreadsheet-demo.png %%DOCSDIR%%/html/images/sprites-combined.png %%DOCSDIR%%/html/images/sql-examples.png @@ -7252,6 +7257,10 @@ %%DOCSDIR%%/html/script-qstetrix.html %%DOCSDIR%%/html/script.html %%DOCSDIR%%/html/scripting.html +%%DOCSDIR%%/html/scripts/functions.js +%%DOCSDIR%%/html/scripts/jquery.js +%%DOCSDIR%%/html/scripts/narrow.js +%%DOCSDIR%%/html/scripts/superfish.js %%DOCSDIR%%/html/session.html %%DOCSDIR%%/html/shadow-builds-wince.html %%DOCSDIR%%/html/shared.html @@ -7341,7 +7350,12 @@ %%DOCSDIR%%/html/statemachine.html %%DOCSDIR%%/html/string-processing.html %%DOCSDIR%%/html/style-reference.html -%%DOCSDIR%%/html/style/offline.css +%%DOCSDIR%%/html/style/narrow.css +%%DOCSDIR%%/html/style/style.css +%%DOCSDIR%%/html/style/style_ie6.css +%%DOCSDIR%%/html/style/style_ie7.css +%%DOCSDIR%%/html/style/style_ie8.css +%%DOCSDIR%%/html/style/superfish.css %%DOCSDIR%%/html/stylesheet-customizing.html %%DOCSDIR%%/html/stylesheet-designer.html %%DOCSDIR%%/html/stylesheet-examples.html diff --git a/misc/qt4-l10n/Makefile b/misc/qt4-l10n/Makefile index b89658585a66..0e57ab9a581e 100644 --- a/misc/qt4-l10n/Makefile +++ b/misc/qt4-l10n/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: qt4-l10n -# Date created: 2008-12-13 -# Whom: Max Brazhnikov <makc@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= l10n DISTVERSION= ${QT4_VERSION} diff --git a/misc/qt4-qtconfig/Makefile b/misc/qt4-qtconfig/Makefile index 419d9d5a0ea4..eb0b30a5a24a 100644 --- a/misc/qt4-qtconfig/Makefile +++ b/misc/qt4-qtconfig/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= qtconfig DISTVERSION= ${QT4_VERSION} @@ -13,10 +9,13 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt graphical configuration utility -OPTIONS= PHONON "Add support for Phonon (implies GStreamer)" on +OPTIONS_DEFINE= PHONON +OPTIONS_DEFAULT=PHONON -USE_QT4= qmake_build moc_build rcc_build uic_build qt3support corelib \ - gui sql xml +PHONON_DESC= Multimedia via Phonon (implies GStreamer) + +USE_QT4= qmake_build moc_build rcc_build uic_build \ + dbus gui xml QT_NONSTANDARD= yes QT_DIST= yes @@ -27,6 +26,10 @@ CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH +DESKTOP_ENTRIES="Qt Configuration" "${COMMENT}" \ + "${PREFIX}/share/pixmaps/qtconfig-qt4.png" \ + "${PREFIX}/bin/qtconfig-qt4" "Settings;Qt;" true + DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/dbus src/multimedia src/network src/opengl \ src/openvg src/s60installs src/s60main src/script \ @@ -41,11 +44,11 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .include <bsd.port.options.mk> -.if !defined(WITHOUT_PHONON) +.if ${PORT_OPTIONS:MPHONON} USE_QT4+= phonon phonon-gst USE_GSTREAMER= yes .else -CONFIGURE_ARGS+= -no-phonon -no-gstreamer +CONFIGURE_ARGS+=-no-phonon -no-gstreamer .endif BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} @@ -63,4 +66,8 @@ pre-configure: ${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/bin/uic ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc +post-install: + ${INSTALL_DATA} ${BUILD_WRKSRC}/images/appicon.png \ + ${PREFIX}/share/pixmaps/qtconfig-qt4.png + .include <bsd.port.mk> diff --git a/misc/qt4-qtconfig/pkg-plist b/misc/qt4-qtconfig/pkg-plist index 4779a9bc5a0e..c47b7dd39e55 100644 --- a/misc/qt4-qtconfig/pkg-plist +++ b/misc/qt4-qtconfig/pkg-plist @@ -1,2 +1,3 @@ bin/qtconfig-qt4 %%DEBUG%%bin/qtconfig-qt4.debug +share/pixmaps/qtconfig-qt4.png diff --git a/misc/qt4-qtdemo/Makefile b/misc/qt4-qtdemo/Makefile index dc4903ab52cc..6b75c6550d0c 100644 --- a/misc/qt4-qtdemo/Makefile +++ b/misc/qt4-qtdemo/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= qtdemo DISTVERSION= ${QT4_VERSION} @@ -29,6 +24,11 @@ CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH +# qtlogo.png is installed by qt4-gui +DESKTOP_ENTRIES="Qt Examples and Demos" "${COMMENT}" \ + "${LOCALBASE}/share/pixmaps/qtlogo.png" \ + "${PREFIX}/bin/qtdemo" "Development;Qt;" true + DO_NOT_EXTRACT= doc mkspecs qmake translations \ src/activeqt src/openvg src/s60installs src/s60main src/tools \ src/winmain src/3rdparty/clucene src/3rdparty/freetype \ diff --git a/misc/qt4-qtdemo/pkg-plist b/misc/qt4-qtdemo/pkg-plist index 566add546632..e5bcaaaa1afb 100644 --- a/misc/qt4-qtdemo/pkg-plist +++ b/misc/qt4-qtdemo/pkg-plist @@ -1878,6 +1878,9 @@ share/examples/qt4/examples/declarative/ui-components/slideswitch/slideswitch.pr share/examples/qt4/examples/declarative/ui-components/slideswitch/slideswitch.qmlproject share/examples/qt4/examples/declarative/ui-components/slideswitch/slideswitch.svg share/examples/qt4/examples/declarative/ui-components/spinner/main.cpp +share/examples/qt4/examples/declarative/ui-components/spinner/qml/spinner/content/Spinner.qml +share/examples/qt4/examples/declarative/ui-components/spinner/qml/spinner/content/spinner-bg.png +share/examples/qt4/examples/declarative/ui-components/spinner/qml/spinner/content/spinner-select.png share/examples/qt4/examples/declarative/ui-components/spinner/qml/spinner/main.qml share/examples/qt4/examples/declarative/ui-components/spinner/spinner %%DEBUG%%share/examples/qt4/examples/declarative/ui-components/spinner/spinner.debug @@ -2731,6 +2734,17 @@ share/examples/qt4/examples/mainwindows/application/images/save.png share/examples/qt4/examples/mainwindows/application/main.cpp share/examples/qt4/examples/mainwindows/application/mainwindow.cpp share/examples/qt4/examples/mainwindows/application/mainwindow.h +share/examples/qt4/examples/mainwindows/dockwidgets/dockwidgets +%%DEBUG%%share/examples/qt4/examples/mainwindows/dockwidgets/dockwidgets.debug +share/examples/qt4/examples/mainwindows/dockwidgets/dockwidgets.pro +share/examples/qt4/examples/mainwindows/dockwidgets/dockwidgets.qrc +share/examples/qt4/examples/mainwindows/dockwidgets/images/new.png +share/examples/qt4/examples/mainwindows/dockwidgets/images/print.png +share/examples/qt4/examples/mainwindows/dockwidgets/images/save.png +share/examples/qt4/examples/mainwindows/dockwidgets/images/undo.png +share/examples/qt4/examples/mainwindows/dockwidgets/main.cpp +share/examples/qt4/examples/mainwindows/dockwidgets/mainwindow.cpp +share/examples/qt4/examples/mainwindows/dockwidgets/mainwindow.h share/examples/qt4/examples/mainwindows/mainwindows.pro share/examples/qt4/examples/mainwindows/mdi/images/copy.png share/examples/qt4/examples/mainwindows/mdi/images/cut.png @@ -4477,6 +4491,8 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro @dirrm share/examples/qt4/examples/mainwindows/menus @dirrm share/examples/qt4/examples/mainwindows/mdi/images @dirrm share/examples/qt4/examples/mainwindows/mdi +@dirrm share/examples/qt4/examples/mainwindows/dockwidgets/images +@dirrm share/examples/qt4/examples/mainwindows/dockwidgets @dirrm share/examples/qt4/examples/mainwindows/application/images @dirrm share/examples/qt4/examples/mainwindows/application @dirrm share/examples/qt4/examples/mainwindows @@ -4594,6 +4610,7 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro @dirrm share/examples/qt4/examples/declarative/ui-components/tabwidget/qml/tabwidget @dirrm share/examples/qt4/examples/declarative/ui-components/tabwidget/qml @dirrm share/examples/qt4/examples/declarative/ui-components/tabwidget +@dirrm share/examples/qt4/examples/declarative/ui-components/spinner/qml/spinner/content @dirrm share/examples/qt4/examples/declarative/ui-components/spinner/qml/spinner @dirrm share/examples/qt4/examples/declarative/ui-components/spinner/qml @dirrm share/examples/qt4/examples/declarative/ui-components/spinner diff --git a/multimedia/qt4-multimedia/Makefile b/multimedia/qt4-multimedia/Makefile index 9961932c3caf..9b3932a7a07d 100644 --- a/multimedia/qt4-multimedia/Makefile +++ b/multimedia/qt4-multimedia/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: qt4-multimedia -# Date created: 17 September 2009 -# Whom: Alberto Villa <villa.alberto@gmail.com> -# # $FreeBSD$ -# PORTNAME= multimedia DISTVERSION= ${QT4_VERSION} diff --git a/multimedia/qt4-phonon-gst/Makefile b/multimedia/qt4-phonon-gst/Makefile index d0dbf1e7e09a..af1956459311 100644 --- a/multimedia/qt4-phonon-gst/Makefile +++ b/multimedia/qt4-phonon-gst/Makefile @@ -14,6 +14,9 @@ PKGNAMESUFFIX= -gst MAINTAINER= kde@FreeBSD.org COMMENT= Qt4 multimedia framework, gstreamer backend +DEPRECATED= Outdated, use multimedia/phonon-gstreamer +EXPIRATION_DATE= 2013-02-28 + USE_QT4= qmake_build moc_build corelib gui phonon opengl dbus QT_NONSTANDARD= yes QT_DIST= yes diff --git a/multimedia/qt4-phonon/Makefile b/multimedia/qt4-phonon/Makefile index ccff63b26a3d..e05fe37d423f 100644 --- a/multimedia/qt4-phonon/Makefile +++ b/multimedia/qt4-phonon/Makefile @@ -13,6 +13,9 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt4 multimedia framework +DEPRECATED= Outdated, use multimedia/phonon +EXPIRATION_DATE= 2013-02-28 + CONFLICTS= phonon-4.* USE_QT4= qmake_build moc_build corelib dbus gui xml diff --git a/net/qt4-network/Makefile b/net/qt4-network/Makefile index 3ed7837d2266..dbaad07a4ad3 100644 --- a/net/qt4-network/Makefile +++ b/net/qt4-network/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= network DISTVERSION= ${QT4_VERSION} diff --git a/textproc/qt4-clucene/Makefile b/textproc/qt4-clucene/Makefile index f0caa2039849..59d788fc6133 100644 --- a/textproc/qt4-clucene/Makefile +++ b/textproc/qt4-clucene/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt4-clucene -# Date created: Fri May 9 15:30:23 CEST 2008 -# Whom: danny@ricin.com -# +# Created by: danny@ricin.com # $FreeBSD$ -# PORTNAME= clucene DISTVERSION= ${QT4_VERSION} diff --git a/textproc/qt4-xml/Makefile b/textproc/qt4-xml/Makefile index c6d70b92438b..60fcdc45dd97 100644 --- a/textproc/qt4-xml/Makefile +++ b/textproc/qt4-xml/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= xml DISTVERSION= ${QT4_VERSION} diff --git a/textproc/qt4-xmlpatterns-tool/Makefile b/textproc/qt4-xmlpatterns-tool/Makefile index 74be22fe94e4..1c59ef10c5c9 100644 --- a/textproc/qt4-xmlpatterns-tool/Makefile +++ b/textproc/qt4-xmlpatterns-tool/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: qt4-xmlpatterns-tool -# Date created: Sat May 10 23:17:08 CEST 2008 -# Whom: danny@ricin.com -# +# Created by: danny@ricin.com # $FreeBSD$ -# PORTNAME= xmlpatterns-tool DISTVERSION= ${QT4_VERSION} diff --git a/textproc/qt4-xmlpatterns/Makefile b/textproc/qt4-xmlpatterns/Makefile index cb5d58616741..de27356dd6b7 100644 --- a/textproc/qt4-xmlpatterns/Makefile +++ b/textproc/qt4-xmlpatterns/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: qt4-xmlpatterns -# Date created: Fri May 9 15:30:23 CEST 2008 -# Whom: danny@ricin.com -# +# Created by: danny@ricin.com # $FreeBSD$ -# PORTNAME= xmlpatterns DISTVERSION= ${QT4_VERSION} diff --git a/www/qt4-webkit/Makefile b/www/qt4-webkit/Makefile index 9d707b8018dc..24020164b2e8 100644 --- a/www/qt4-webkit/Makefile +++ b/www/qt4-webkit/Makefile @@ -9,8 +9,6 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt4 WebKit engine -USE_GNOME= glib20 -USE_GSTREAMER= yes USE_QT4= corelib declarative gui network \ qmake_build moc_build rcc_build QT_NONSTANDARD= yes @@ -44,6 +42,19 @@ CONFIGURE_ARGS+= -I../../../../include/Qt -I../../../../include EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +OPTIONS_DEFINE= GSTREAMER +OPTIONS_DEFAULT= GSTREAMER + +GSTREAMER_DESC= HTML5 audio and video support + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MGSTREAMER} +USE_GSTREAMER= yes +.else +CONFIGURE_ARGS+= -no-gstreamer +.endif + .include <bsd.port.pre.mk> # Base ld(1) segfaults on PowerPC: @@ -57,8 +68,7 @@ pre-configure: ${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 - # Avoid building and installing several tests. Should this be - # made an option? +# Avoid building and installing several tests. Should this be made an option? ${REINPLACE_CMD} -e '/WebKit\/qt\/tests/ d' \ ${BUILD_WRKSRC}/WebKit.pro @@ -76,7 +86,7 @@ post-configure: ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ ${WRKSRC}/lib/pkgconfig/QtWebKit.pc - # QtWebKit is statically linked with jscore, remove the latest. +# QtWebKit is statically linked with jscore, remove the latest. ${REINPLACE_CMD} -e 's|-L../JavaScriptCore/release||; s|-ljscore||' \ ${WRKSRC}/lib/pkgconfig/QtWebKit.pc \ ${WRKSRC}/lib/libQtWebKit.la diff --git a/www/qt4-webkit/pkg-plist b/www/qt4-webkit/pkg-plist index 3923148494bf..ed6d821dd7c6 100644 --- a/www/qt4-webkit/pkg-plist +++ b/www/qt4-webkit/pkg-plist @@ -64,7 +64,7 @@ lib/qt4/libQtWebKit.prl lib/qt4/libQtWebKit.so lib/qt4/libQtWebKit.so.4 lib/qt4/libQtWebKit.so.4.9 -lib/qt4/libQtWebKit.so.4.9.2 +lib/qt4/libQtWebKit.so.4.9.3 libdata/pkgconfig/QtWebKit.pc share/qt4/mkspecs/modules/qt_webkit_version.pri @dirrmtry share/qt4/mkspecs/modules diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile index 6db3fddef591..ce237d8b6efb 100644 --- a/x11-toolkits/qt4-gui/Makefile +++ b/x11-toolkits/qt4-gui/Makefile @@ -1,14 +1,8 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= gui DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES?= x11-toolkits PKGNAMEPREFIX= qt4- @@ -106,6 +100,8 @@ post-configure: ${WRKSRC}/lib/pkgconfig/QtGui.pc post-install: + ${INSTALL_DATA} ${BUILD_WRKSRC}/dialogs/images/qtlogo-64.png \ + ${PREFIX}/share/pixmaps/qtlogo.png @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/x11-toolkits/qt4-gui/files/patch-git_ca89c49 b/x11-toolkits/qt4-gui/files/patch-git_ca89c49 deleted file mode 100644 index 1b8a35947694..000000000000 --- a/x11-toolkits/qt4-gui/files/patch-git_ca89c49 +++ /dev/null @@ -1,32 +0,0 @@ -From ca89c49fa2c5cbb3945897046f33eed9f7da846c Mon Sep 17 00:00:00 2001 -From: Jiang Jiang <jiang.jiang@nokia.com> -Date: Tue, 3 Jul 2012 10:17:49 +0200 -Subject: [PATCH] Fix cursor truncate to include line position - -Since we could have moved the line position (QTextLine::setPosition), -the truncating position should be adjusted with that. - -Change-Id: Ie1acd4a1b6a4adfbeeb9ce8ee2dfa19d992470e8 -Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> ---- - src/gui/text/qtextlayout.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp -index 16f7150..52f2793 100644 ---- ./src/gui/text/qtextlayout.cpp -+++ ./src/gui/text/qtextlayout.cpp -@@ -2616,8 +2616,8 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const - x += eng->offsetInLigature(si, pos, end, glyph_pos); - } - -- if (eng->option.wrapMode() != QTextOption::NoWrap && x > line.width) -- x = line.width; -+ if (eng->option.wrapMode() != QTextOption::NoWrap && x > line.x + line.width) -+ x = line.x + line.width; - - *cursorPos = pos + si->position; - return x.toReal(); --- -1.7.10 - diff --git a/x11-toolkits/qt4-gui/pkg-plist b/x11-toolkits/qt4-gui/pkg-plist index ecc28990b887..0022e0e14b8f 100644 --- a/x11-toolkits/qt4-gui/pkg-plist +++ b/x11-toolkits/qt4-gui/pkg-plist @@ -1153,6 +1153,7 @@ lib/qt4/libQtGui.so.%%SHLIB_SHVER%% lib/qt4/libQtGui.so.%%SHLIB_VER%% %%DEBUG%%lib/qt4/libQtGui.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtGui.pc +share/pixmaps/qtlogo.png @dirrmtry lib/qt4 @dirrm include/qt4/QtGui @dirrmtry include/qt4/Qt diff --git a/x11/qt4-graphicssystems-opengl/Makefile b/x11/qt4-graphicssystems-opengl/Makefile index f221e5ef0967..78f81f36263c 100644 --- a/x11/qt4-graphicssystems-opengl/Makefile +++ b/x11/qt4-graphicssystems-opengl/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: qt4-graphicssystems-opengl -# Date created: 2010-11-07 -# Whom: Max Brazhnikov <makc@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= graphicssystems DISTVERSION= ${QT4_VERSION} diff --git a/x11/qt4-inputmethods/Makefile b/x11/qt4-inputmethods/Makefile index ebded8af87a7..db24250f1ee9 100644 --- a/x11/qt4-inputmethods/Makefile +++ b/x11/qt4-inputmethods/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= inputmethods DISTVERSION= ${QT4_VERSION} diff --git a/x11/qt4-opengl/Makefile b/x11/qt4-opengl/Makefile index 86b11ffa3c13..82deff6f0195 100644 --- a/x11/qt4-opengl/Makefile +++ b/x11/qt4-opengl/Makefile @@ -1,10 +1,5 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= opengl DISTVERSION= ${QT4_VERSION} diff --git a/x11/qt4-opengl/files/patch-src__corelib__tools__qiterator.h b/x11/qt4-opengl/files/patch-src__corelib__tools__qiterator.h deleted file mode 100644 index 9a2a2ca2daa7..000000000000 --- a/x11/qt4-opengl/files/patch-src__corelib__tools__qiterator.h +++ /dev/null @@ -1,38 +0,0 @@ -commit 5210d47aa66214e3cb16f394d0510a91f770c1b1 -Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> -Date: Mon Jul 16 23:39:07 2012 -0300 - - Only forward-declare some std classes if QT_NO_STL is defined. - - If that is not done, building with clang, libc++ and C++11 support - does not work: libc++ defines the iterator tag classes in an inline - namespace inside the std namespace, and forward-declaring those - classes inside the std namespace itself in qiterator.h causes an - ambiguity that clang solves by choosing the incomplete-declared class - declared in the enclosing std namespace. - - This is probably the "clang build problem" reported in commit - 19e2b4d6eb733d9fd4eb69c0622b699fd08a3203 to qtbase, which cannot be - directly cherry-picked without breaking other classes due to QT_NO_STL - still being present in Qt 4. - - Change-Id: I26e33915347d3f94ef2e10b68fca6b2099ec9491 - Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> - -diff --git a/src/corelib/tools/qiterator.h b/src/corelib/tools/qiterator.h -index 0747940..b9d8da6 100644 ---- ./src/corelib/tools/qiterator.h -+++ ./src/corelib/tools/qiterator.h -@@ -46,10 +46,12 @@ - - QT_BEGIN_HEADER - -+#ifdef QT_NO_STL - namespace std { - struct bidirectional_iterator_tag; - struct random_access_iterator_tag; - } -+#endif - - QT_BEGIN_NAMESPACE - |