sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Qt to 4.8.5 and Qt Creator to 2.8.0.

Browse source 
Proudly brought to you by the KDE on FreeBSD team, with commits by makc@,
Schaich Alonso and yours truly.

Besides the tons of upstream fixes, we have mkspecs for GCC 4.9 and clang33
(from ports), staging support in the Makefiles and dependency fixes related
to pkg-config.

Many thanks to the people who helped test the ports using our area51
repository, and also to the people who provided patches and bug reports via
GNATS!

PR:		ports/180615
	        ports/181921
		ports/182049
This commit is contained in:
Raphael Kubo da Costa 2013-10-13 23:15:50 +00:00
parent 28bc26a55d
commit ecda38b0a5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=330266
92 changed files with 589 additions and 905 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Mk/bsd.qt.mk
View file

@ -34,6 +34,10 @@ DISTNAME= qt-everywhere-opensource-src-${QT4_VERSION}
DIST_SUBDIR= KDE DIST_SUBDIR= KDE
#CONFLICTS+= Currently there are no conflicts \o/ #CONFLICTS+= Currently there are no conflicts \o/
# Stage support
DESTDIRNAME= INSTALL_ROOT
# rene: can go after a while # rene: can go after a while
CONFLICTS_BUILD= qt-3.* qt-copy-3.* CONFLICTS_BUILD= qt-3.* qt-copy-3.*
@ -106,9 +110,7 @@ QMAKE?= ${QT_PREFIX}/bin/qmake-qt4
QMAKEFLAGS+= QMAKE_CC="${CC}" QMAKE_CXX="${CXX}" \ QMAKEFLAGS+= QMAKE_CC="${CC}" QMAKE_CXX="${CXX}" \
QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" \ QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" \
QMAKE_LINK_C="${CC}" QMAKE_LINK_C_SHLIB="${CC}" \ QMAKE_LINK_C="${CC}" QMAKE_LINK_C_SHLIB="${CC}" \
QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" \ QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}"
QMAKE_CFLAGS_THREAD="${PTHREAD_CFLAGS}" \
QMAKE_LFLAGS_THREAD="${PTHREAD_LIBS}"
QTCPPFLAGS?= QTCPPFLAGS?=
QTCGFLIBS?= QTCGFLIBS?=
@ -118,7 +120,7 @@ QTCGFLIBS?=
# #
# QT4 version # QT4 version
# #
QT4_VERSION?= 4.8.4 QT4_VERSION?= 4.8.5
_USE_QT4_ALL= accessible assistant assistant-adp assistantclient \ _USE_QT4_ALL= accessible assistant assistant-adp assistantclient \
clucene codecs-cn codecs-jp codecs-kr codecs-tw corelib \ clucene codecs-cn codecs-jp codecs-kr codecs-tw corelib \

3
accessibility/qt4-accessible/Makefile
View file

@ -9,7 +9,6 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org
COMMENT= Qt accessibility widgets COMMENT= Qt accessibility widgets
NO_STAGE= yes
USE_QT4= qmake_build moc_build qt3support corelib gui network sql xml USE_QT4= qmake_build moc_build qt3support corelib gui network sql xml
QT_NONSTANDARD= yes QT_NONSTANDARD= yes
QT_DIST= yes QT_DIST= yes
@ -36,7 +35,7 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs

3
chinese/qt4-codecs-cn/Makefile
View file

@ -36,9 +36,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/cn BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/cn
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

3
chinese/qt4-codecs-tw/Makefile
View file

@ -36,9 +36,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/tw BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/tw
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

8
databases/qt4-ibase-plugin/Makefile
View file

@ -3,7 +3,6 @@
PORTNAME= qt4-${DB}-plugin PORTNAME= qt4-${DB}-plugin
DISTVERSION= ${QT4_VERSION} DISTVERSION= ${QT4_VERSION}
PORTREVISION= 1
CATEGORIES= databases CATEGORIES= databases
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org
@ -30,5 +29,10 @@ MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
QT_LIBDIR="${QT_LIBDIR}" QT_LIBDIR="${QT_LIBDIR}"
PLIST_SUB= DB=${DB} PLIST_SUB= DB=${DB}
NO_STAGE= yes SQL_PLUGINDIR= ${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers
do-install:
@${MKDIR} ${STAGEDIR}${SQL_PLUGINDIR}
${INSTALL_LIB} ${WRKSRC}/libqsql${DB}.so ${STAGEDIR}${SQL_PLUGINDIR}
.include <bsd.port.mk> .include <bsd.port.mk>

11
databases/qt4-ibase-plugin/files/Makefile.bsd
View file

@ -6,21 +6,14 @@ CXXFLAGS+= -I${DRIVER} -Iinclude \
-I${QT_INCDIR}/Qt \ -I${QT_INCDIR}/Qt \
-I${QT_INCDIR}/QtCore \ -I${QT_INCDIR}/QtCore \
-I${LOCALBASE}/include \ -I${LOCALBASE}/include \
${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \
-DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \ -DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \
-D_LARGEFILE_SOURCE -DQT_SHARED -D_LARGEFILE_SOURCE -DQT_SHARED
MOC?= ${LOCALBASE}/bin/moc-qt4 MOC?= ${LOCALBASE}/bin/moc-qt4
LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lgds LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -pthread -lQtSql -lgds
SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp
LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers
${LIBDIR}:
mkdir -p ${LIBDIR}
moc_qsql_${DB}.cpp: qsql_${DB}.h moc_qsql_${DB}.cpp: qsql_${DB}.h
$(MOC) $(.ALLSRC) -o $(.TARGET) $(MOC) $(.ALLSRC) -o $(.TARGET)
beforeinstall: ${LIBDIR}
.include <bsd.lib.mk> .include <bsd.lib.mk>

7
databases/qt4-mysql-plugin/Makefile
View file

@ -28,5 +28,10 @@ MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
QT_LIBDIR="${QT_LIBDIR}" QT_LIBDIR="${QT_LIBDIR}"
PLIST_SUB= DB=${DB} PLIST_SUB= DB=${DB}
NO_STAGE= yes SQL_PLUGINDIR= ${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers
do-install:
@${MKDIR} ${STAGEDIR}${SQL_PLUGINDIR}
${INSTALL_LIB} ${WRKSRC}/libqsql${DB}.so ${STAGEDIR}${SQL_PLUGINDIR}
.include <bsd.port.mk> .include <bsd.port.mk>

11
databases/qt4-mysql-plugin/files/Makefile.bsd
View file

@ -6,23 +6,16 @@ CXXFLAGS+= -I${DRIVER} \
-I${QT_INCDIR}/Qt \ -I${QT_INCDIR}/Qt \
-I${LOCALBASE}/include/mysql \ -I${LOCALBASE}/include/mysql \
-I${LOCALBASE}/include \ -I${LOCALBASE}/include \
${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_PLUGIN \ -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_PLUGIN \
-DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_SHARED -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_SHARED
LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql ${PTHREAD_LIBS} -lQtSql -lmysqlclient_r LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql -pthread -lQtSql -lmysqlclient_r
MOC?= ${LOCALBASE}/bin/moc-qt4 MOC?= ${LOCALBASE}/bin/moc-qt4
SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp qsql_${DB}.moc SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp qsql_${DB}.moc
LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers
${LIBDIR}:
mkdir -p ${LIBDIR}
moc_qsql_${DB}.cpp: qsql_${DB}.h moc_qsql_${DB}.cpp: qsql_${DB}.h
$(MOC) $(.ALLSRC) -o $(.TARGET) $(MOC) $(.ALLSRC) -o $(.TARGET)
qsql_${DB}.moc: qsql_${DB}.cpp qsql_${DB}.moc: qsql_${DB}.cpp
$(MOC) $(.ALLSRC) -o ${DRIVER}/$(.TARGET) $(MOC) $(.ALLSRC) -o ${DRIVER}/$(.TARGET)
beforeinstall: ${LIBDIR}
.include <bsd.lib.mk> .include <bsd.lib.mk>

7
databases/qt4-odbc-plugin/Makefile
View file

@ -29,5 +29,10 @@ MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
QT_LIBDIR="${QT_LIBDIR}" QT_LIBDIR="${QT_LIBDIR}"
PLIST_SUB= DB=${DB} PLIST_SUB= DB=${DB}
NO_STAGE= yes SQL_PLUGINDIR= ${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers
do-install:
@${MKDIR} ${STAGEDIR}${SQL_PLUGINDIR}
${INSTALL_LIB} ${WRKSRC}/libqsql${DB}.so ${STAGEDIR}${SQL_PLUGINDIR}
.include <bsd.port.mk> .include <bsd.port.mk>

11
databases/qt4-odbc-plugin/files/Makefile.bsd
View file

@ -7,21 +7,14 @@ CXXFLAGS+= -I${DRIVER} \
-I${QT_INCDIR}/QtCore \ -I${QT_INCDIR}/QtCore \
-I${QT_INCDIR}/QtSql \ -I${QT_INCDIR}/QtSql \
-I${LOCALBASE}/include \ -I${LOCALBASE}/include \
${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \
-DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \ -DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \
-D_LARGEFILE_SOURCE -DQT_SHARED -DUNICODE -D_LARGEFILE_SOURCE -DQT_SHARED -DUNICODE
LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lodbc LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -pthread -lQtSql -lodbc
MOC?= ${LOCALBASE}/bin/moc-qt4 MOC?= ${LOCALBASE}/bin/moc-qt4
SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp
LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers
${LIBDIR}:
mkdir -p ${LIBDIR}
moc_qsql_${DB}.cpp: qsql_${DB}.h moc_qsql_${DB}.cpp: qsql_${DB}.h
$(MOC) $(.ALLSRC) -o $(.TARGET) $(MOC) $(.ALLSRC) -o $(.TARGET)
beforeinstall: ${LIBDIR}
.include <bsd.lib.mk> .include <bsd.lib.mk>

7
databases/qt4-pgsql-plugin/Makefile
View file

@ -28,5 +28,10 @@ MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
QT_LIBDIR="${QT_LIBDIR}" QT_LIBDIR="${QT_LIBDIR}"
PLIST_SUB= DB=${DB} PLIST_SUB= DB=${DB}
NO_STAGE= yes SQL_PLUGINDIR= ${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers
do-install:
@${MKDIR} ${STAGEDIR}${SQL_PLUGINDIR}
${INSTALL_LIB} ${WRKSRC}/libqsql${DB}.so ${STAGEDIR}${SQL_PLUGINDIR}
.include <bsd.port.mk> .include <bsd.port.mk>

11
databases/qt4-pgsql-plugin/files/Makefile.bsd
View file

@ -6,21 +6,14 @@ CXXFLAGS+= -I${DRIVER} \
-I${QT_INCDIR}/Qt \ -I${QT_INCDIR}/Qt \
-I${LOCALBASE}/include/postgresql/server \ -I${LOCALBASE}/include/postgresql/server \
-I${LOCALBASE}/include \ -I${LOCALBASE}/include \
${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \
-DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \ -DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \
-D_LARGEFILE_SOURCE -DQT_SHARED -D_LARGEFILE_SOURCE -DQT_SHARED
MOC?= ${LOCALBASE}/bin/moc-qt4 MOC?= ${LOCALBASE}/bin/moc-qt4
LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lpq LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -pthread -lQtSql -lpq
SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp
LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers
${LIBDIR}:
mkdir -p ${LIBDIR}
moc_qsql_${DB}.cpp: qsql_${DB}.h moc_qsql_${DB}.cpp: qsql_${DB}.h
$(MOC) $(.ALLSRC) -o $(.TARGET) $(MOC) $(.ALLSRC) -o $(.TARGET)
beforeinstall: ${LIBDIR}
.include <bsd.lib.mk> .include <bsd.lib.mk>

3
databases/qt4-sql/Makefile
View file

@ -36,9 +36,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

7
databases/qt4-sqlite-plugin/Makefile
View file

@ -30,5 +30,10 @@ MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
QT_LIBDIR="${QT_LIBDIR}" QT_LIBDIR="${QT_LIBDIR}"
PLIST_SUB= DB=${DB} PLIST_SUB= DB=${DB}
NO_STAGE= yes SQL_PLUGINDIR= ${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers
do-install:
@${MKDIR} ${STAGEDIR}${SQL_PLUGINDIR}
${INSTALL_LIB} ${WRKSRC}/libq${DB}.so ${STAGEDIR}${SQL_PLUGINDIR}
.include <bsd.port.mk> .include <bsd.port.mk>

11
databases/qt4-sqlite-plugin/files/Makefile.bsd
View file

@ -5,21 +5,14 @@ CXXFLAGS+= -I${DRIVER} -Iinclude \
-I${QT_INCDIR} \ -I${QT_INCDIR} \
-I${QT_INCDIR}/Qt \ -I${QT_INCDIR}/Qt \
-I${LOCALBASE}/include \ -I${LOCALBASE}/include \
${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \
-DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \ -DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \
-D_LARGEFILE_SOURCE -DQT_SHARED -D_LARGEFILE_SOURCE -DQT_SHARED
MOC?= ${LOCALBASE}/bin/moc-qt4 MOC?= ${LOCALBASE}/bin/moc-qt4
LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lsqlite LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -pthread -lQtSql -lsqlite
SRCS= smain.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp SRCS= smain.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp
LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers
${LIBDIR}:
mkdir -p ${LIBDIR}
moc_qsql_${DB}.cpp: qsql_${DB}.h moc_qsql_${DB}.cpp: qsql_${DB}.h
$(MOC) $(.ALLSRC) -o $(.TARGET) $(MOC) $(.ALLSRC) -o $(.TARGET)
beforeinstall: ${LIBDIR}
.include <bsd.lib.mk> .include <bsd.lib.mk>

7
databases/qt4-sqlite3-plugin/Makefile
View file

@ -31,5 +31,10 @@ MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
QT_LIBDIR="${QT_LIBDIR}" QT_LIBDIR="${QT_LIBDIR}"
PLIST_SUB= DB=${DB} PLIST_SUB= DB=${DB}
NO_STAGE= yes SQL_PLUGINDIR= ${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers
do-install:
@${MKDIR} ${STAGEDIR}${SQL_PLUGINDIR}
${INSTALL_LIB} ${WRKSRC}/libq${DB}.so ${STAGEDIR}${SQL_PLUGINDIR}
.include <bsd.port.mk> .include <bsd.port.mk>

11
databases/qt4-sqlite3-plugin/files/Makefile.bsd
View file

@ -5,21 +5,14 @@ CXXFLAGS+= -I${DRIVER} -Iinclude \
-I${QT_INCDIR} \ -I${QT_INCDIR} \
-I${QT_INCDIR}/Qt \ -I${QT_INCDIR}/Qt \
-I${LOCALBASE}/include \ -I${LOCALBASE}/include \
${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \
-DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \ -DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \
-D_LARGEFILE_SOURCE -DQT_SHARED -D_LARGEFILE_SOURCE -DQT_SHARED
MOC?= ${LOCALBASE}/bin/moc-qt4 MOC?= ${LOCALBASE}/bin/moc-qt4
LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lsqlite3 LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -pthread -lQtSql -lsqlite3
SRCS= smain.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp SRCS= smain.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp
LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers
${LIBDIR}:
mkdir -p ${LIBDIR}
moc_qsql_${DB}.cpp: qsql_${DB}.h moc_qsql_${DB}.cpp: qsql_${DB}.h
$(MOC) $(.ALLSRC) -o $(.TARGET) $(MOC) $(.ALLSRC) -o $(.TARGET)
beforeinstall: ${LIBDIR}
.include <bsd.lib.mk> .include <bsd.lib.mk>

3
devel/dbus-qt4/Makefile
View file

@ -40,9 +40,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/tools/qdbus BUILD_WRKSRC= ${WRKSRC}/tools/qdbus
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
# Without this workaround, qdbus crashes. # Without this workaround, qdbus crashes.

18
devel/qmake4/Makefile
View file

@ -3,7 +3,6 @@
PORTNAME= qmake PORTNAME= qmake
DISTVERSION= ${QT4_VERSION} DISTVERSION= ${QT4_VERSION}
PORTREVISION= 1
CATEGORIES= devel CATEGORIES= devel
PKGNAMEPREFIX= qt4- PKGNAMEPREFIX= qt4-
@ -37,7 +36,6 @@ EXTRACT_AFTER_ARGS= \
'${DISTNAME}/tools/shared/symbian' \ '${DISTNAME}/tools/shared/symbian' \
'${DISTNAME}/tools/shared/windows' '${DISTNAME}/tools/shared/windows'
NO_STAGE= yes
post-patch: post-patch:
@${REINPLACE_CMD} -e 's|-O2|${CXXFLAGS}|' \ @${REINPLACE_CMD} -e 's|-O2|${CXXFLAGS}|' \
-e 's|/usr/local|${LOCALBASE}|' \ -e 's|/usr/local|${LOCALBASE}|' \
@ -60,9 +58,16 @@ post-patch:
-e 's|gcc46|clang|g' \ -e 's|gcc46|clang|g' \
-e 's|g++46|clang++|g' \ -e 's|g++46|clang++|g' \
${WRKSRC}/../mkspecs/freebsd-clang/qmake.conf ${WRKSRC}/../mkspecs/freebsd-clang/qmake.conf
# mkspec for devel/clang33
@${CP} -PpR ${WRKSRC}/../mkspecs/freebsd-g++46 ${WRKSRC}/../mkspecs/freebsd-clang++33
@${REINPLACE_CMD} -e 's|g++-unix.conf|clang.conf|g' \
-e 's|freebsd-g++46|freebsd-clang++33|g' \
-e 's|gcc46|clang33|g' \
-e 's|g++46|clang++33|g' \
${WRKSRC}/../mkspecs/freebsd-clang++33/qmake.conf
# Add mkspecs for the different GCC versions in the ports tree # Add mkspecs for the different GCC versions in the ports tree
.for v in 42 44 47 48 .for v in 42 44 47 48 49
@${CP} -PpR ${WRKSRC}/../mkspecs/freebsd-g++46 ${WRKSRC}/../mkspecs/freebsd-g++${v} @${CP} -PpR ${WRKSRC}/../mkspecs/freebsd-g++46 ${WRKSRC}/../mkspecs/freebsd-g++${v}
@${REINPLACE_CMD} -e 's|46|${v}|g' \ @${REINPLACE_CMD} -e 's|46|${v}|g' \
${WRKSRC}/../mkspecs/freebsd-g++${v}/qmake.conf ${WRKSRC}/../mkspecs/freebsd-g++${v}/qmake.conf
@ -76,7 +81,10 @@ do-configure:
${ECHO} '/* empty */' > ${WRKSRC}/qconfig.h ${ECHO} '/* empty */' > ${WRKSRC}/qconfig.h
${LN} ${WRKSRC}/qconfig.h ${WRKSRC}/../src/corelib/global/qconfig.h ${LN} ${WRKSRC}/qconfig.h ${WRKSRC}/../src/corelib/global/qconfig.h
post-install: do-install:
${LN} -sf ${PREFIX}/share/qt4/mkspecs/freebsd-${QMAKE_BASE_COMPILER} ${PREFIX}/share/qt4/mkspecs/default ${INSTALL_PROGRAM} ${WRKSRC}/qmake-qt4 ${STAGEDIR}${PREFIX}/bin
${MKDIR} ${STAGEDIR}${PREFIX}/share/qt4 && \
cd ${WRKSRC}/.. && ${COPYTREE_SHARE} mkspecs ${STAGEDIR}${PREFIX}/share/qt4
${LN} -sf ${PREFIX}/share/qt4/mkspecs/freebsd-${QMAKE_BASE_COMPILER} ${STAGEDIR}${PREFIX}/share/qt4/mkspecs/default
.include <bsd.port.mk> .include <bsd.port.mk>

7
devel/qmake4/files/Makefile.bsd
View file

@ -43,12 +43,5 @@ CXXFLAGS+=-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT \
PROG_CXX= qmake-qt4 PROG_CXX= qmake-qt4
BINDIR= ${PREFIX}/bin BINDIR= ${PREFIX}/bin
SHAREDIR=${PREFIX}/share/qt4
${SHAREDIR}:
mkdir -p "$@"
beforeinstall: ${SHAREDIR}
cp -Rp ${.CURDIR:H}/mkspecs ${SHAREDIR}
.include <bsd.prog.mk> .include <bsd.prog.mk>

12
devel/qmake4/pkg-plist
View file

@ -9,6 +9,10 @@ share/qt4/mkspecs/aix-xlc/qmake.conf
share/qt4/mkspecs/aix-xlc/qplatformdefs.h share/qt4/mkspecs/aix-xlc/qplatformdefs.h
share/qt4/mkspecs/blackberry-armv7le-qcc/qmake.conf share/qt4/mkspecs/blackberry-armv7le-qcc/qmake.conf
share/qt4/mkspecs/blackberry-armv7le-qcc/qplatformdefs.h share/qt4/mkspecs/blackberry-armv7le-qcc/qplatformdefs.h
share/qt4/mkspecs/blackberry-playbook-armv7le-qcc/qmake.conf
share/qt4/mkspecs/blackberry-playbook-armv7le-qcc/qplatformdefs.h
share/qt4/mkspecs/blackberry-playbook-x86-qcc/qmake.conf
share/qt4/mkspecs/blackberry-playbook-x86-qcc/qplatformdefs.h
share/qt4/mkspecs/blackberry-x86-qcc/qmake.conf share/qt4/mkspecs/blackberry-x86-qcc/qmake.conf
share/qt4/mkspecs/blackberry-x86-qcc/qplatformdefs.h share/qt4/mkspecs/blackberry-x86-qcc/qplatformdefs.h
share/qt4/mkspecs/common/aix/qplatformdefs.h share/qt4/mkspecs/common/aix/qplatformdefs.h
@ -201,6 +205,8 @@ share/qt4/mkspecs/features/win32/windows.prf
share/qt4/mkspecs/features/yacc.prf share/qt4/mkspecs/features/yacc.prf
share/qt4/mkspecs/freebsd-clang/qmake.conf share/qt4/mkspecs/freebsd-clang/qmake.conf
share/qt4/mkspecs/freebsd-clang/qplatformdefs.h share/qt4/mkspecs/freebsd-clang/qplatformdefs.h
share/qt4/mkspecs/freebsd-clang++33/qmake.conf
share/qt4/mkspecs/freebsd-clang++33/qplatformdefs.h
share/qt4/mkspecs/freebsd-g++/qmake.conf share/qt4/mkspecs/freebsd-g++/qmake.conf
share/qt4/mkspecs/freebsd-g++/qplatformdefs.h share/qt4/mkspecs/freebsd-g++/qplatformdefs.h
share/qt4/mkspecs/freebsd-g++42/qmake.conf share/qt4/mkspecs/freebsd-g++42/qmake.conf
@ -213,6 +219,8 @@ share/qt4/mkspecs/freebsd-g++47/qmake.conf
share/qt4/mkspecs/freebsd-g++47/qplatformdefs.h share/qt4/mkspecs/freebsd-g++47/qplatformdefs.h
share/qt4/mkspecs/freebsd-g++48/qmake.conf share/qt4/mkspecs/freebsd-g++48/qmake.conf
share/qt4/mkspecs/freebsd-g++48/qplatformdefs.h share/qt4/mkspecs/freebsd-g++48/qplatformdefs.h
share/qt4/mkspecs/freebsd-g++49/qmake.conf
share/qt4/mkspecs/freebsd-g++49/qplatformdefs.h
share/qt4/mkspecs/freebsd-icc/qmake.conf share/qt4/mkspecs/freebsd-icc/qmake.conf
share/qt4/mkspecs/freebsd-icc/qplatformdefs.h share/qt4/mkspecs/freebsd-icc/qplatformdefs.h
share/qt4/mkspecs/hpux-acc-64/qmake.conf share/qt4/mkspecs/hpux-acc-64/qmake.conf
@ -708,12 +716,14 @@ share/qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h
@dirrm share/qt4/mkspecs/hpux-acc-64 @dirrm share/qt4/mkspecs/hpux-acc-64
@dirrm share/qt4/mkspecs/hpux-acc @dirrm share/qt4/mkspecs/hpux-acc
@dirrm share/qt4/mkspecs/freebsd-icc @dirrm share/qt4/mkspecs/freebsd-icc
@dirrm share/qt4/mkspecs/freebsd-g++49
@dirrm share/qt4/mkspecs/freebsd-g++48 @dirrm share/qt4/mkspecs/freebsd-g++48
@dirrm share/qt4/mkspecs/freebsd-g++47 @dirrm share/qt4/mkspecs/freebsd-g++47
@dirrm share/qt4/mkspecs/freebsd-g++46 @dirrm share/qt4/mkspecs/freebsd-g++46
@dirrm share/qt4/mkspecs/freebsd-g++44 @dirrm share/qt4/mkspecs/freebsd-g++44
@dirrm share/qt4/mkspecs/freebsd-g++42 @dirrm share/qt4/mkspecs/freebsd-g++42
@dirrm share/qt4/mkspecs/freebsd-g++ @dirrm share/qt4/mkspecs/freebsd-g++
@dirrm share/qt4/mkspecs/freebsd-clang++33
@dirrm share/qt4/mkspecs/freebsd-clang @dirrm share/qt4/mkspecs/freebsd-clang
@dirrm share/qt4/mkspecs/features/win32 @dirrm share/qt4/mkspecs/features/win32
@dirrm share/qt4/mkspecs/features/unix @dirrm share/qt4/mkspecs/features/unix
@ -737,6 +747,8 @@ share/qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h
@dirrm share/qt4/mkspecs/common/aix @dirrm share/qt4/mkspecs/common/aix
@dirrm share/qt4/mkspecs/common @dirrm share/qt4/mkspecs/common
@dirrm share/qt4/mkspecs/blackberry-x86-qcc @dirrm share/qt4/mkspecs/blackberry-x86-qcc
@dirrm share/qt4/mkspecs/blackberry-playbook-x86-qcc
@dirrm share/qt4/mkspecs/blackberry-playbook-armv7le-qcc
@dirrm share/qt4/mkspecs/blackberry-armv7le-qcc @dirrm share/qt4/mkspecs/blackberry-armv7le-qcc
@dirrm share/qt4/mkspecs/aix-xlc-64 @dirrm share/qt4/mkspecs/aix-xlc-64
@dirrm share/qt4/mkspecs/aix-xlc @dirrm share/qt4/mkspecs/aix-xlc

3
devel/qt4-assistant-adp/Makefile
View file

@ -18,13 +18,14 @@ COMMENT= Qt documentation browser, adp compat version
USE_QT4= qmake_build moc_build rcc_build uic_build corelib \ USE_QT4= qmake_build moc_build rcc_build uic_build corelib \
gui network xml doc dbus gui network xml doc dbus
# stage support
DESTDIRNAME= INSTALL_ROOT
ALL_TARGET= first ALL_TARGET= first
WRKSRC= ${WRKDIR}/${DISTNAME:C/src/version/} WRKSRC= ${WRKDIR}/${DISTNAME:C/src/version/}
PLIST_FILES= bin/assistant_adp PLIST_FILES= bin/assistant_adp
NO_STAGE= yes
pre-configure: pre-configure:
${REINPLACE_CMD} -e 's|$$$$\[QT_INSTALL_BINS]|${PREFIX}/bin|g' \ ${REINPLACE_CMD} -e 's|$$$$\[QT_INSTALL_BINS]|${PREFIX}/bin|g' \
${WRKSRC}/compat.pro ${WRKSRC}/compat.pro

5
devel/qt4-assistant/Makefile
View file

@ -40,9 +40,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME}/tools/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME}/tools/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${REINPLACE_CMD} \ ${REINPLACE_CMD} \
-e 's|^TARGET.*|TARGET=assistant-qt4|g' \ -e 's|^TARGET.*|TARGET=assistant-qt4|g' \
@ -55,6 +54,6 @@ pre-configure:
post-install: post-install:
${INSTALL_DATA} ${BUILD_WRKSRC}/images/assistant-128.png \ ${INSTALL_DATA} ${BUILD_WRKSRC}/images/assistant-128.png \
${PREFIX}/share/pixmaps/assistant-qt4.png ${STAGEDIR}${PREFIX}/share/pixmaps/assistant-qt4.png
.include <bsd.port.mk> .include <bsd.port.mk>

11
devel/qt4-corelib/Makefile
View file

@ -3,7 +3,6 @@
PORTNAME= corelib PORTNAME= corelib
DISTVERSION= ${QT4_VERSION} DISTVERSION= ${QT4_VERSION}
PORTREVISION= 5
CATEGORIES?= devel CATEGORIES?= devel
PKGNAMEPREFIX= qt4- PKGNAMEPREFIX= qt4-
@ -41,9 +40,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
.include "${.CURDIR}/../../devel/qt4/files/Makefile.options" .include "${.CURDIR}/../../devel/qt4/files/Makefile.options"
.if empty(QT4_OPTIONS:MCUPS) .if empty(QT4_OPTIONS:MCUPS)
@ -79,8 +77,9 @@ post-configure:
${WRKSRC}/lib/pkgconfig/QtCore.pc ${WRKSRC}/lib/pkgconfig/QtCore.pc
post-install: post-install:
${MKDIR} ${PREFIX}/lib/qt4/plugins ${MKDIR} ${STAGEDIR}${PREFIX}/lib/qt4/plugins
${TOUCH} ${PREFIX}/lib/qt4/plugins/.keep_me ${TOUCH} ${STAGEDIR}${PREFIX}/lib/qt4/plugins/.keep_me
${INSTALL_DATA} ${WRKSRC}/mkspecs/qconfig.pri ${PREFIX}/share/qt4/mkspecs/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/qt4/mkspecs
${INSTALL_DATA} ${WRKSRC}/mkspecs/qconfig.pri ${STAGEDIR}${PREFIX}/share/qt4/mkspecs/
.include <bsd.port.mk> .include <bsd.port.mk>

81
devel/qt4-corelib/files/patch-git_8d33f67
View file

@ -1,81 +0,0 @@
From 8d33f673d3aaa7107c8e86d6591bd3f077f0313d Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Fri, 10 May 2013 04:08:38 +0300
Subject: [PATCH] Special-case the forward declaration of STL types for libc++.
This is somewhat of a follow-up to 5210d47aa66214e3cb16f394d0510a91f770c1b1.
libc++ declares the STL types in an inline namespace within the "std" one if
clang is used.
If one includes a header such as <iterator> before a Qt one and builds with
QT_NO_STL, the following ends up happening:
// <iterator>
namespace std {
inline namespace __1 {
struct random_access_iterator ... ;
}
}
// qiterator.h
#ifdef QT_NO_STL
namespace std {
struct random_access_iterator;
}
#endif
qiterator.h's declaration shadows the original one, and the compiler
complains random_access_iterator lacks an actual declaration.
Solve this by checking for libc++ and forward-declaring the iterator types
we need within the same inline namespace.
Not backported from qtbase because QT_NO_STL does not exist in Qt 5.
Change-Id: I6742d540f6538a30aa060a4447c288cfb9cd781d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
src/corelib/tools/qiterator.h | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/src/corelib/tools/qiterator.h b/src/corelib/tools/qiterator.h
index c859d37..54c331e 100644
--- src/corelib/tools/qiterator.h
+++ src/corelib/tools/qiterator.h
@@ -47,10 +47,33 @@
QT_BEGIN_HEADER
#ifdef QT_NO_STL
+# include <ciso646> // No-op, indirectly include additional configuration headers.
+# if defined(_LIBCPP_VERSION)
+// libc++ may declare these structs in an inline namespace. Forward-declare
+// these iterators in the same namespace so that we do not shadow the original
+// declarations.
+
+// Tell clang not to warn about the use of inline namespaces when not building
+// in C++11 mode.
+# if defined(Q_CC_CLANG)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wc++11-extensions"
+# endif
+
+_LIBCPP_BEGIN_NAMESPACE_STD
+ struct bidirectional_iterator_tag;
+ struct random_access_iterator_tag;
+_LIBCPP_END_NAMESPACE_STD
+
+# if defined(Q_CC_CLANG)
+# pragma GCC diagnostic pop
+# endif
+# else
namespace std {
struct bidirectional_iterator_tag;
struct random_access_iterator_tag;
}
+# endif
#endif
QT_BEGIN_NAMESPACE
--
1.8.4

35
devel/qt4-corelib/files/patch-git_ccd1b2ee
View file

@ -1,35 +0,0 @@
commit ccd1b2ee01c193cd157978c1f9f08f87d0f9c94b
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Fri May 10 01:40:23 2013 +0300
Check that 3DNow! instructions are supported before including mm3dnow.h.
Include mm3dnow.h the way we already include the (S)SSE{3,4} and AVX
instruction headers: by checking that the compiler is set to support those
instructions besides verifying that QT_HAVE_3DNOW evalues to true (which
only means the compiler supported them when the build was being configured).
This has not caused a problem in most cases so far because GCC protects its
mm3dnow.h header with an #ifdef __3dNOW__ (contrary to what it does on, say,
pmmintrin.h). clang's mm3dnow.h, on the other hand, does not have that check
and can fail if -march is set to, for example, i386 or i486.
Not backported from qt5 because qtbase because qsimd_p.h does not include
the 3DNow! headers after commit a1b30b49ef09bef2e97b9a0622bf7ad622678fee.
Change-Id: I15ab5e936c71c55f89c3f25777ab27fbd262e9cd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
index 87e26e1..6a32e8f 100644
--- ./src/corelib/tools/qsimd_p.h
+++ ./src/corelib/tools/qsimd_p.h
@@ -199,7 +199,7 @@ QT_BEGIN_HEADER
#endif
// 3D now intrinsics
-#if defined(QT_HAVE_3DNOW)
+#if defined(QT_HAVE_3DNOW) && (defined(__3dNOW__) || defined(Q_CC_MSVC))
#include <mm3dnow.h>
#endif

16
devel/qt4-corelib/files/patch-src__corelib__animation__qpropertyanimation.cpp
View file

@ -1,16 +0,0 @@
--- src/corelib/animation/qpropertyanimation.cpp.orig
+++ src/corelib/animation/qpropertyanimation.cpp
@@ -136,8 +136,11 @@ void QPropertyAnimationPrivate::updateProperty(const QVariant &newValue)
if (newValue.userType() == propertyType) {
//no conversion is needed, we directly call the QMetaObject::metacall
- void *data = const_cast<void*>(newValue.constData());
- QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, &data);
+ //check QMetaProperty::write for an explanation of these
+ int status = -1;
+ int flags = 0;
+ void *argv[] = { const_cast<void *>(newValue.constData()), const_cast<QVariant *>(&newValue), &status, &flags };
+ QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, argv);
} else {
targetValue->setProperty(propertyName.constData(), newValue);
}

3
devel/qt4-corelib/pkg-plist
View file

@ -89,6 +89,7 @@ include/qt4/Qt/qline.h
include/qt4/Qt/qlinkedlist.h include/qt4/Qt/qlinkedlist.h
include/qt4/Qt/qlist.h include/qt4/Qt/qlist.h
include/qt4/Qt/qlocale.h include/qt4/Qt/qlocale.h
include/qt4/Qt/qlocale_blackberry.h
include/qt4/Qt/qmap.h include/qt4/Qt/qmap.h
include/qt4/Qt/qmargins.h include/qt4/Qt/qmargins.h
include/qt4/Qt/qmath.h include/qt4/Qt/qmath.h
@ -189,6 +190,7 @@ include/qt4/QtCore/QAnimationGroup
include/qt4/QtCore/QArgument include/qt4/QtCore/QArgument
include/qt4/QtCore/QAtomicInt include/qt4/QtCore/QAtomicInt
include/qt4/QtCore/QAtomicPointer include/qt4/QtCore/QAtomicPointer
include/qt4/QtCore/QBBSystemLocaleData
include/qt4/QtCore/QBasicAtomicInt include/qt4/QtCore/QBasicAtomicInt
include/qt4/QtCore/QBasicAtomicPointer include/qt4/QtCore/QBasicAtomicPointer
include/qt4/QtCore/QBasicTimer include/qt4/QtCore/QBasicTimer
@ -535,6 +537,7 @@ include/qt4/QtCore/qline.h
include/qt4/QtCore/qlinkedlist.h include/qt4/QtCore/qlinkedlist.h
include/qt4/QtCore/qlist.h include/qt4/QtCore/qlist.h
include/qt4/QtCore/qlocale.h include/qt4/QtCore/qlocale.h
include/qt4/QtCore/qlocale_blackberry.h
include/qt4/QtCore/qmap.h include/qt4/QtCore/qmap.h
include/qt4/QtCore/qmargins.h include/qt4/QtCore/qmargins.h
include/qt4/QtCore/qmath.h include/qt4/QtCore/qmath.h

3
devel/qt4-declarative/Makefile
View file

@ -35,9 +35,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

20
devel/qt4-declarative/files/patch-src-declarative-util-qdeclarativefontloader.cpp
View file

@ -1,20 +0,0 @@
--- src/declarative/util/qdeclarativefontloader.cpp.orig 2013-04-24 09:08:17.000000000 +0800
+++ src/declarative/util/qdeclarativefontloader.cpp 2013-04-24 09:09:13.000000000 +0800
@@ -64,7 +64,7 @@
Q_OBJECT
public:
- QDeclarativeFontObject(int _id);
+ QDeclarativeFontObject(int _id = -1);
void download(const QUrl &url, QNetworkAccessManager *manager);
@@ -84,7 +84,7 @@
Q_DISABLE_COPY(QDeclarativeFontObject)
};
-QDeclarativeFontObject::QDeclarativeFontObject(int _id = -1)
+QDeclarativeFontObject::QDeclarativeFontObject(int _id)
: QObject(0), id(_id), reply(0), redirectCount(0) {}

5
devel/qt4-designer/Makefile
View file

@ -42,9 +42,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=designer-qt4|g' \ ${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=designer-qt4|g' \
${BUILD_WRKSRC}/src/${PORTNAME}/${PORTNAME}.pro ${BUILD_WRKSRC}/src/${PORTNAME}/${PORTNAME}.pro
@ -71,6 +70,6 @@ pre-install:
post-install: post-install:
${INSTALL_DATA} ${BUILD_WRKSRC}/src/designer/images/designer.png \ ${INSTALL_DATA} ${BUILD_WRKSRC}/src/designer/images/designer.png \
${PREFIX}/share/pixmaps/designer-qt4.png ${STAGEDIR}${PREFIX}/share/pixmaps/designer-qt4.png
.include <bsd.port.mk> .include <bsd.port.mk>

3
devel/qt4-help-tools/Makefile
View file

@ -37,9 +37,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/tools/assistant/tools BUILD_WRKSRC= ${WRKSRC}/tools/assistant/tools
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${REINPLACE_CMD} -e 's|assistant||' \ ${REINPLACE_CMD} -e 's|assistant||' \
${BUILD_WRKSRC}/tools.pro ${BUILD_WRKSRC}/tools.pro

3
devel/qt4-help/Makefile
View file

@ -37,9 +37,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/tools/assistant/lib BUILD_WRKSRC= ${WRKSRC}/tools/assistant/lib
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

12
devel/qt4-libqtassistantclient/Makefile
View file

@ -19,12 +19,13 @@ USE_QT4= qmake_build moc_build rcc_build corelib gui network
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
ALL_TARGET= first ALL_TARGET= first
# stage support
DESTDIRNAME= INSTALL_ROOT
WRKSRC= ${WRKDIR}/${DISTNAME:C/src/version/} WRKSRC= ${WRKDIR}/${DISTNAME:C/src/version/}
BUILD_WRKSRC= ${WRKSRC}/lib BUILD_WRKSRC= ${WRKSRC}/lib
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
NO_STAGE= yes
pre-configure: pre-configure:
${REINPLACE_CMD} -e 's|$$$$\[QT_INSTALL_HEADERS]|${PREFIX}/${QT_INCDIR_REL}|g' \ ${REINPLACE_CMD} -e 's|$$$$\[QT_INSTALL_HEADERS]|${PREFIX}/${QT_INCDIR_REL}|g' \
-e 's|$$$$\[QT_INSTALL_LIBS]|${PREFIX}/${QT_LIBDIR_REL}|g' \ -e 's|$$$$\[QT_INSTALL_LIBS]|${PREFIX}/${QT_LIBDIR_REL}|g' \
@ -48,9 +49,10 @@ pre-build:
${BUILD_WRKSRC}/QtAssistant ${BUILD_WRKSRC}/QtAssistant
post-install: post-install:
${INSTALL_DATA} ${FILESDIR}/QAssistantClient ${PREFIX}/${QT_INCDIR_REL}/QtAssistant ${MKDIR} ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtAssistant
${INSTALL_DATA} ${FILESDIR}/QtAssistant ${PREFIX}/${QT_INCDIR_REL}/QtAssistant ${INSTALL_DATA} ${FILESDIR}/QAssistantClient ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtAssistant
${MKDIR} ${PREFIX}/share/qt4/mkspecs/features ${INSTALL_DATA} ${FILESDIR}/QtAssistant ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtAssistant
${INSTALL_DATA} ${WRKSRC}/features/assistant.prf ${PREFIX}/share/qt4/mkspecs/features ${MKDIR} ${STAGEDIR}${PREFIX}/share/qt4/mkspecs/features
${INSTALL_DATA} ${WRKSRC}/features/assistant.prf ${STAGEDIR}${PREFIX}/share/qt4/mkspecs/features
.include <bsd.port.mk> .include <bsd.port.mk>

5
devel/qt4-linguist/Makefile
View file

@ -40,9 +40,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${REINPLACE_CMD} -E -e 's|^TARGET[[:blank:]]*=[[:blank:]]*([a-z]+)|TARGET=\1-qt4|g' \ ${REINPLACE_CMD} -E -e 's|^TARGET[[:blank:]]*=[[:blank:]]*([a-z]+)|TARGET=\1-qt4|g' \
${BUILD_WRKSRC}/${PORTNAME}.pro ${BUILD_WRKSRC}/${PORTNAME}/${PORTNAME}.pro \ ${BUILD_WRKSRC}/${PORTNAME}.pro ${BUILD_WRKSRC}/${PORTNAME}/${PORTNAME}.pro \
@ -55,6 +54,6 @@ pre-configure:
post-install: post-install:
${INSTALL_DATA} ${BUILD_WRKSRC}/linguist/images/icons/linguist-128-32.png \ ${INSTALL_DATA} ${BUILD_WRKSRC}/linguist/images/icons/linguist-128-32.png \
${PREFIX}/share/pixmaps/linguist-qt4.png ${STAGEDIR}${PREFIX}/share/pixmaps/linguist-qt4.png
.include <bsd.port.mk> .include <bsd.port.mk>

17
devel/qt4-makeqpf/Makefile
View file

@ -9,6 +9,8 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org
COMMENT= Qt qtopia font creator COMMENT= Qt qtopia font creator
BROKEN_sparc64= does not compile
USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui
QT_NONSTANDARD= yes QT_NONSTANDARD= yes
QT_DIST= yes QT_DIST= yes
@ -35,18 +37,7 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 802502
EXTRA_PATCHES+= ${FILESDIR}/extra-patch__tools__makeqpf__qpf2.cpp
.endif
.if ${ARCH} == "sparc64"
BROKEN= does not compile on sparc64
.endif
pre-configure: pre-configure:
${REINPLACE_CMD} -e 's|^TARGET[[:blank:]]*=[[:blank:]]*|TARGET=${PORTNAME}-qt4|g' \ ${REINPLACE_CMD} -e 's|^TARGET[[:blank:]]*=[[:blank:]]*|TARGET=${PORTNAME}-qt4|g' \
@ -57,4 +48,4 @@ pre-configure:
${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/bin/uic ${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/bin/uic
${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc
.include <bsd.port.post.mk> .include <bsd.port.mk>

11
devel/qt4-makeqpf/files/extra-patch__tools__makeqpf__qpf2.cpp
View file

@ -1,11 +0,0 @@
--- tools/makeqpf/qpf2.cpp.orig 2009-09-07 13:00:31.000000000 +0200
+++ tools/makeqpf/qpf2.cpp 2009-09-21 22:15:11.717123200 +0200
@@ -363,6 +363,8 @@
int startGlyphIndex;
};
+#define log2(x) log(x)/log(2)
+
static QByteArray generateTrueTypeCMap(QFontEngine *fe)
{
QByteArray cmap;

13
devel/qt4-moc/Makefile
View file

@ -9,6 +9,8 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org
COMMENT= Qt meta object compiler COMMENT= Qt meta object compiler
BROKEN_arm= does not compile
USE_QT4= qmake_build USE_QT4= qmake_build
QT_NONSTANDARD= yes QT_NONSTANDARD= yes
QT_DIST= yes QT_DIST= yes
@ -35,9 +37,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/tools/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src/tools/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \ ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \
-e 's|^TARGET.*|TARGET=moc-qt4|g' \ -e 's|^TARGET.*|TARGET=moc-qt4|g' \
@ -48,10 +49,4 @@ pre-configure:
pre-build: pre-build:
cd ${BUILD_WRKSRC}/../bootstrap && ${MAKE} cd ${BUILD_WRKSRC}/../bootstrap && ${MAKE}
.include <bsd.port.pre.mk> .include <bsd.port.mk>
.if ${ARCH} == "arm"
BROKEN= does not compile on arm
.endif
.include <bsd.port.post.mk>

10
devel/qt4-moc/files/patch-src__tools__moc__main.cpp
View file

@ -1,10 +0,0 @@
--- ./src/tools/moc/main.cpp.orig 2013-01-30 16:16:31.615488856 +0000
+++ ./src/tools/moc/main.cpp 2013-01-30 16:16:52.991681291 +0000
@@ -187,6 +187,7 @@
Moc moc;
pp.macros["Q_MOC_RUN"];
pp.macros["__cplusplus"];
+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
QByteArray filename;
QByteArray output;
FILE *in = 0;

3
devel/qt4-porting/Makefile
View file

@ -35,9 +35,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

5
devel/qt4-qdbusviewer/Makefile
View file

@ -43,9 +43,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/tools/qdbus/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/tools/qdbus/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
post-patch: post-patch:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
@ -54,6 +53,6 @@ post-patch:
post-install: post-install:
${INSTALL_DATA} ${BUILD_WRKSRC}/images/qdbusviewer-128.png \ ${INSTALL_DATA} ${BUILD_WRKSRC}/images/qdbusviewer-128.png \
${PREFIX}/share/pixmaps/qdbusviewer.png ${STAGEDIR}${PREFIX}/share/pixmaps/qdbusviewer.png
.include <bsd.port.mk> .include <bsd.port.mk>

3
devel/qt4-qdoc3/Makefile
View file

@ -27,12 +27,11 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \
EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
.endfor .endfor
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs/modules ${MKDIR} ${WRKSRC}/mkspecs/modules
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

3
devel/qt4-qmlviewer/Makefile
View file

@ -41,9 +41,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/tools/qml/ BUILD_WRKSRC= ${WRKSRC}/tools/qml/
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
post-patch: post-patch:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

3
devel/qt4-qt3support/Makefile
View file

@ -36,9 +36,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

3
devel/qt4-qtestlib/Makefile
View file

@ -36,9 +36,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/testlib BUILD_WRKSRC= ${WRKSRC}/src/testlib
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

5
devel/qt4-qvfb/Makefile
View file

@ -42,9 +42,8 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC}
CONFIGURE_ARGS+= -I../../include/Qt -I../../include CONFIGURE_ARGS+= -I../../include/Qt -I../../include
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=qvfb-qt4|g' \ ${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=qvfb-qt4|g' \
@ -56,6 +55,6 @@ pre-configure:
post-install: post-install:
${INSTALL_DATA} ${BUILD_WRKSRC}/images/logo.png \ ${INSTALL_DATA} ${BUILD_WRKSRC}/images/logo.png \
${PREFIX}/share/pixmaps/qvfb-qt4.png ${STAGEDIR}${PREFIX}/share/pixmaps/qvfb-qt4.png
.include <bsd.port.mk> .include <bsd.port.mk>

13
devel/qt4-rcc/Makefile
View file

@ -9,6 +9,8 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org
COMMENT= Qt resource compiler COMMENT= Qt resource compiler
BROKEN_arm= does not compile
USE_QT4= qmake_build USE_QT4= qmake_build
QT_NONSTANDARD= yes QT_NONSTANDARD= yes
QT_DIST= yes QT_DIST= yes
@ -35,9 +37,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/tools/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src/tools/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \ ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \
${BUILD_WRKSRC}/${PORTNAME}.pro ${BUILD_WRKSRC}/${PORTNAME}.pro
@ -47,10 +48,4 @@ pre-configure:
pre-build: pre-build:
cd ${BUILD_WRKSRC}/../bootstrap && ${MAKE} cd ${BUILD_WRKSRC}/../bootstrap && ${MAKE}
.include <bsd.port.pre.mk> .include <bsd.port.mk>
.if ${ARCH} == "arm"
BROKEN= does not configure on arm
.endif
.include <bsd.port.post.mk>

4
devel/qt4-script/Makefile
View file

@ -3,7 +3,6 @@
PORTNAME= script PORTNAME= script
DISTVERSION= ${QT4_VERSION} DISTVERSION= ${QT4_VERSION}
PORTREVISION= 1
CATEGORIES?= devel CATEGORIES?= devel
PKGNAMEPREFIX= qt4- PKGNAMEPREFIX= qt4-
@ -38,9 +37,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

13
devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__interpreter__Interpreter.cpp
View file

@ -1,13 +0,0 @@
--- ./src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp.orig 2011-06-30 00:43:03.155579428 +0200
+++ ./src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp 2011-06-30 00:43:34.275444696 +0200
@@ -2493,8 +2493,10 @@
vPC += OPCODE_LENGTH(op_get_by_pname);
NEXT_INSTRUCTION();
}
+ {
Identifier propertyName(callFrame, subscript.toString(callFrame));
result = baseValue.get(callFrame, propertyName);
+ }
CHECK_FOR_EXCEPTION();
callFrame->r(dst) = result;
vPC += OPCODE_LENGTH(op_get_by_pname);

3
devel/qt4-scripttools/Makefile
View file

@ -35,9 +35,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

13
devel/qt4-uic/Makefile
View file

@ -9,6 +9,8 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org
COMMENT= Qt user interface compiler COMMENT= Qt user interface compiler
BROKEN_arm= does not compile
USE_QT4= qmake_build USE_QT4= qmake_build
QT_NONSTANDARD= yes QT_NONSTANDARD= yes
QT_DIST= yes QT_DIST= yes
@ -35,9 +37,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/tools/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src/tools/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \ ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \
-e 's|^TARGET.*|TARGET=uic-qt4|g' \ -e 's|^TARGET.*|TARGET=uic-qt4|g' \
@ -48,10 +49,4 @@ pre-configure:
pre-build: pre-build:
cd ${BUILD_WRKSRC}/../bootstrap && ${MAKE} cd ${BUILD_WRKSRC}/../bootstrap && ${MAKE}
.include <bsd.port.pre.mk> .include <bsd.port.mk>
.if ${ARCH} == "arm"
BROKEN= does not configure on arm
.endif
.include <bsd.port.post.mk>

3
devel/qt4-uic3/Makefile
View file

@ -34,9 +34,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/tools/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src/tools/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

2
devel/qt4/Makefile
View file

@ -26,7 +26,7 @@ CODECS_DESC= CN, JP, KR, TW codecs support
SQL_PLUGINS_DESC= Install database plugins for QtSql SQL_PLUGINS_DESC= Install database plugins for QtSql
TOOLS_DESC= Install Qt tools (qmake, moc, etc.) TOOLS_DESC= Install Qt tools (qmake, moc, etc.)
NO_STAGE= yes NO_MTREE= yes
.include <bsd.port.options.mk> .include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MCODECS} .if ${PORT_OPTIONS:MCODECS}

4
devel/qt4/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA256 (KDE/qt-everywhere-opensource-src-4.8.5.tar.gz) = eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138
SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028 SIZE (KDE/qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467

7
devel/qt4/files/patch-configure
View file

@ -39,12 +39,13 @@
echo "Creating qmake. Please wait..." echo "Creating qmake. Please wait..."
OLD_QCONFIG_H= OLD_QCONFIG_H=
@@ -5831,14 +5826,6 @@ @@ -5995,15 +5995,6 @@
QMakeVar add QMAKE_CXXFLAGS -fpermissive
X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive" X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
fi fi
-
- # Check we actually have X11 :-) - # Check we actually have X11 :-)
- "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS - compileTest x11/xlib "XLib" $X11TESTS_FLAGS
- if [ $? != "0" ]; then - if [ $? != "0" ]; then
- echo "Basic XLib functionality test failed!" - echo "Basic XLib functionality test failed!"
- echo " You might need to modify the include and library search paths by editing" - echo " You might need to modify the include and library search paths by editing"

15
devel/qtcreator/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= qtcreator PORTNAME= qtcreator
DISTVERSION= 2.6.1 DISTVERSION= 2.8.0
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_QT:S/$/:qtcreator/} \ MASTER_SITES= ${MASTER_SITE_QT:S/$/:qtcreator/} \
${MASTER_SITE_QT} ${MASTER_SITE_QT}
@ -26,14 +26,16 @@ USE_QT4= qmake_build moc_build rcc_build uic_build \
dbus designer gui help-tools_build network script \ dbus designer gui help-tools_build network script \
sql svg xml webkit qdoc3_build sql svg xml webkit qdoc3_build
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
MAKE_ENV+= INSTALL_ROOT=${PREFIX}
MAKE_JOBS_UNSAFE= yes MAKE_JOBS_UNSAFE= yes
ALL_TARGET= all docs ALL_TARGET= all docs
INSTALL_TARGET= install install_docs INSTALL_TARGET= install install_docs
MAKE_ENV= XDG_CONFIG_HOME=/dev/null
USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}
QMAKE_ARGS= -recursive CONFIG+="configure" ${QMAKE_PRO} QMAKE_ARGS= -recursive CONFIG+="configure" QTC_PREFIX=${PREFIX} ${QMAKE_PRO}
QMAKE_PRO= ${WRKSRC}/${PORTNAME}.pro QMAKE_PRO= ${WRKSRC}/${PORTNAME}.pro
# stage support
DESTDIRNAME= INSTALL_ROOT
# Build Qt Quick Designer (requires update on every Qt update). # Build Qt Quick Designer (requires update on every Qt update).
QT_DISTNAME= qt-everywhere-opensource-src-${QT4_VERSION} QT_DISTNAME= qt-everywhere-opensource-src-${QT4_VERSION}
@ -51,15 +53,18 @@ INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}
DESKTOP_ENTRIES= "Qt Creator" "${COMMENT}" "QtProject-qtcreator" \ DESKTOP_ENTRIES= "Qt Creator" "${COMMENT}" "QtProject-qtcreator" \
"${PREFIX}/bin/${PORTNAME}" "Development;Qt;" true "${PREFIX}/bin/${PORTNAME}" "Development;Qt;" true
NO_STAGE= yes
post-patch: post-patch:
${REINPLACE_CMD} -e 's|lrelease|lrelease-qt4|' \ ${REINPLACE_CMD} -e 's|lrelease|lrelease-qt4|' \
${WRKSRC}/share/qtcreator/translations/translations.pro ${WRKSRC}/share/qtcreator/translations/translations.pro
${REINPLACE_CMD} -e 's|lupdate|lupdate-qt4|' \ ${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}|' \ ${REINPLACE_CMD} -e 's|/usr/bin/gnuplot|${LOCALBASE}/gnuplot|' \
${WRKSRC}/share/qtcreator/dumper/gbridge.py
${REINPLACE_CMD} -e 's|/usr/bin/ant|${LOCALBASE}/ant|' \
${WRKSRC}/src/plugins/android/androidsettingswidget.cpp ${WRKSRC}/src/plugins/android/androidsettingswidget.cpp
${RM} ${WRKSRC}/share/qtcreator/dumper/gbridge.py.bak
do-configure: do-configure:
${MKDIR} ${CONFIGURE_WRKSRC} ${MKDIR} ${CONFIGURE_WRKSRC}
cd ${CONFIGURE_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ cd ${CONFIGURE_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \

8
devel/qtcreator/distinfo
View file

@ -1,4 +1,4 @@
SHA256 (KDE/qt-creator-2.6.1-src.tar.gz) = 8031e81e5e81e398575dd90245defcd29eeaf60d5907861707d85f4325d3d215 SHA256 (KDE/qt-creator-2.8.0-src.tar.gz) = 7ac5d9a36c2f561f74d77378d4eae95a78c7752b323e1df924d6e895e99f45d2
SIZE (KDE/qt-creator-2.6.1-src.tar.gz) = 21355916 SIZE (KDE/qt-creator-2.8.0-src.tar.gz) = 24210148
SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA256 (KDE/qt-everywhere-opensource-src-4.8.5.tar.gz) = eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138
SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028 SIZE (KDE/qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467

11
devel/qtcreator/files/patch-src__libs__utils__savefile.cpp
View file

@ -1,11 +0,0 @@
--- ./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());

16
devel/qtcreator/files/patch-src__plugins__android__androidconfigurations.h
View file

@ -1,16 +0,0 @@
--- ./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

12
devel/qtcreator/files/patch-src__plugins__android__androidsettingswidget.cpp
View file

@ -1,12 +0,0 @@
--- ./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);

11
devel/qtcreator/files/patch-src__plugins__android__androidtoolchain.cpp
View file

@ -1,11 +0,0 @@
--- ./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
);

13
devel/qtcreator/files/patch-src__plugins__qt4projectmanager__makestep.cpp
View file

@ -1,13 +0,0 @@
--- ./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");

591
devel/qtcreator/pkg-plist
View file

@ -12,10 +12,6 @@ lib/qtcreator/libCPlusPlus.so
lib/qtcreator/libCPlusPlus.so.1 lib/qtcreator/libCPlusPlus.so.1
lib/qtcreator/libCPlusPlus.so.1.0 lib/qtcreator/libCPlusPlus.so.1.0
lib/qtcreator/libCPlusPlus.so.1.0.0 lib/qtcreator/libCPlusPlus.so.1.0.0
lib/qtcreator/libDebuggingHelper.so
lib/qtcreator/libDebuggingHelper.so.1
lib/qtcreator/libDebuggingHelper.so.1.0
lib/qtcreator/libDebuggingHelper.so.1.0.0
lib/qtcreator/libExtensionSystem.so lib/qtcreator/libExtensionSystem.so
lib/qtcreator/libExtensionSystem.so.1 lib/qtcreator/libExtensionSystem.so.1
lib/qtcreator/libExtensionSystem.so.1.0 lib/qtcreator/libExtensionSystem.so.1.0
@ -48,10 +44,16 @@ lib/qtcreator/libUtils.so
lib/qtcreator/libUtils.so.1 lib/qtcreator/libUtils.so.1
lib/qtcreator/libUtils.so.1.0 lib/qtcreator/libUtils.so.1.0
lib/qtcreator/libUtils.so.1.0.0 lib/qtcreator/libUtils.so.1.0.0
lib/qtcreator/libqbscore.so
lib/qtcreator/libqbscore.so.1
lib/qtcreator/libqbscore.so.1.0
lib/qtcreator/libqbscore.so.1.0.0
lib/qtcreator/libzeroconf.so lib/qtcreator/libzeroconf.so
lib/qtcreator/libzeroconf.so.1 lib/qtcreator/libzeroconf.so.1
lib/qtcreator/libzeroconf.so.1.0 lib/qtcreator/libzeroconf.so.1.0
lib/qtcreator/libzeroconf.so.1.0.0 lib/qtcreator/libzeroconf.so.1.0.0
lib/qtcreator/plugins/BlackBerry/Qnx.pluginspec
lib/qtcreator/plugins/BlackBerry/libQnx.so
lib/qtcreator/plugins/QtProject/AnalyzerBase.pluginspec lib/qtcreator/plugins/QtProject/AnalyzerBase.pluginspec
lib/qtcreator/plugins/QtProject/Android.pluginspec lib/qtcreator/plugins/QtProject/Android.pluginspec
lib/qtcreator/plugins/QtProject/AutotoolsProjectManager.pluginspec lib/qtcreator/plugins/QtProject/AutotoolsProjectManager.pluginspec
@ -68,6 +70,7 @@ lib/qtcreator/plugins/QtProject/CppEditor.pluginspec
lib/qtcreator/plugins/QtProject/CppTools.pluginspec lib/qtcreator/plugins/QtProject/CppTools.pluginspec
lib/qtcreator/plugins/QtProject/Debugger.pluginspec lib/qtcreator/plugins/QtProject/Debugger.pluginspec
lib/qtcreator/plugins/QtProject/Designer.pluginspec lib/qtcreator/plugins/QtProject/Designer.pluginspec
lib/qtcreator/plugins/QtProject/DiffEditor.pluginspec
lib/qtcreator/plugins/QtProject/FakeVim.pluginspec lib/qtcreator/plugins/QtProject/FakeVim.pluginspec
lib/qtcreator/plugins/QtProject/Find.pluginspec lib/qtcreator/plugins/QtProject/Find.pluginspec
lib/qtcreator/plugins/QtProject/GLSLEditor.pluginspec lib/qtcreator/plugins/QtProject/GLSLEditor.pluginspec
@ -82,6 +85,8 @@ lib/qtcreator/plugins/QtProject/Madde.pluginspec
lib/qtcreator/plugins/QtProject/Mercurial.pluginspec lib/qtcreator/plugins/QtProject/Mercurial.pluginspec
lib/qtcreator/plugins/QtProject/Perforce.pluginspec lib/qtcreator/plugins/QtProject/Perforce.pluginspec
lib/qtcreator/plugins/QtProject/ProjectExplorer.pluginspec lib/qtcreator/plugins/QtProject/ProjectExplorer.pluginspec
lib/qtcreator/plugins/QtProject/PythonEditor.pluginspec
lib/qtcreator/plugins/QtProject/QbsProjectManager.pluginspec
lib/qtcreator/plugins/QtProject/QmlDesigner.pluginspec lib/qtcreator/plugins/QtProject/QmlDesigner.pluginspec
lib/qtcreator/plugins/QtProject/QmlJSEditor.pluginspec lib/qtcreator/plugins/QtProject/QmlJSEditor.pluginspec
lib/qtcreator/plugins/QtProject/QmlJSTools.pluginspec lib/qtcreator/plugins/QtProject/QmlJSTools.pluginspec
@ -115,6 +120,7 @@ lib/qtcreator/plugins/QtProject/libCppEditor.so
lib/qtcreator/plugins/QtProject/libCppTools.so lib/qtcreator/plugins/QtProject/libCppTools.so
lib/qtcreator/plugins/QtProject/libDebugger.so lib/qtcreator/plugins/QtProject/libDebugger.so
lib/qtcreator/plugins/QtProject/libDesigner.so lib/qtcreator/plugins/QtProject/libDesigner.so
lib/qtcreator/plugins/QtProject/libDiffEditor.so
lib/qtcreator/plugins/QtProject/libFakeVim.so lib/qtcreator/plugins/QtProject/libFakeVim.so
lib/qtcreator/plugins/QtProject/libFind.so lib/qtcreator/plugins/QtProject/libFind.so
lib/qtcreator/plugins/QtProject/libGLSLEditor.so lib/qtcreator/plugins/QtProject/libGLSLEditor.so
@ -129,6 +135,8 @@ lib/qtcreator/plugins/QtProject/libMadde.so
lib/qtcreator/plugins/QtProject/libMercurial.so lib/qtcreator/plugins/QtProject/libMercurial.so
lib/qtcreator/plugins/QtProject/libPerforce.so lib/qtcreator/plugins/QtProject/libPerforce.so
lib/qtcreator/plugins/QtProject/libProjectExplorer.so lib/qtcreator/plugins/QtProject/libProjectExplorer.so
lib/qtcreator/plugins/QtProject/libPythonEditor.so
lib/qtcreator/plugins/QtProject/libQbsProjectManager.so
lib/qtcreator/plugins/QtProject/libQmlDesigner.so lib/qtcreator/plugins/QtProject/libQmlDesigner.so
lib/qtcreator/plugins/QtProject/libQmlJSEditor.so lib/qtcreator/plugins/QtProject/libQmlJSEditor.so
lib/qtcreator/plugins/QtProject/libQmlJSTools.so lib/qtcreator/plugins/QtProject/libQmlJSTools.so
@ -146,12 +154,7 @@ lib/qtcreator/plugins/QtProject/libUpdateInfo.so
lib/qtcreator/plugins/QtProject/libValgrind.so lib/qtcreator/plugins/QtProject/libValgrind.so
lib/qtcreator/plugins/QtProject/libVcsBase.so lib/qtcreator/plugins/QtProject/libVcsBase.so
lib/qtcreator/plugins/QtProject/libWelcome.so lib/qtcreator/plugins/QtProject/libWelcome.so
lib/qtcreator/plugins/RIM/Qnx.pluginspec lib/qtcreator/qmldesigner/libcomponentsplugin.so
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/qmldesigner/libqtquickplugin.so
lib/qtcreator/qtcomponents/Button.qml lib/qtcreator/qtcomponents/Button.qml
lib/qtcreator/qtcomponents/ButtonRow.qml lib/qtcreator/qtcomponents/ButtonRow.qml
@ -219,12 +222,12 @@ share/qtcreator/designer/templates/Main_Window.ui
share/qtcreator/designer/templates/Widget.ui share/qtcreator/designer/templates/Widget.ui
share/qtcreator/dumper/LGPL_EXCEPTION.TXT share/qtcreator/dumper/LGPL_EXCEPTION.TXT
share/qtcreator/dumper/LICENSE.LGPL share/qtcreator/dumper/LICENSE.LGPL
share/qtcreator/dumper/bridge.py
share/qtcreator/dumper/dumper.cpp share/qtcreator/dumper/dumper.cpp
share/qtcreator/dumper/dumper.h share/qtcreator/dumper/dumper.h
share/qtcreator/dumper/dumper.pro share/qtcreator/dumper/dumper.pro
share/qtcreator/dumper/dumper.py
share/qtcreator/dumper/dumper_p.h share/qtcreator/dumper/dumper_p.h
share/qtcreator/dumper/gbridge.py
share/qtcreator/dumper/lbridge.py
share/qtcreator/dumper/pdumper.py share/qtcreator/dumper/pdumper.py
share/qtcreator/dumper/qttypes.py share/qtcreator/dumper/qttypes.py
share/qtcreator/dumper/test/dumpertest.pro share/qtcreator/dumper/test/dumpertest.pro
@ -257,12 +260,87 @@ share/qtcreator/glsl/glsl_120_common.glsl
share/qtcreator/glsl/glsl_es_100.frag share/qtcreator/glsl/glsl_es_100.frag
share/qtcreator/glsl/glsl_es_100.vert share/qtcreator/glsl/glsl_es_100.vert
share/qtcreator/glsl/glsl_es_100_common.glsl share/qtcreator/glsl/glsl_es_100_common.glsl
share/qtcreator/qbs/lib/qbs/plugins/libqbs_cpp_scanner.so
share/qtcreator/qbs/lib/qbs/plugins/libqbs_qt_scanner.so
share/qtcreator/qbs/share/qbs/imports/qbs/FileInfo/fileinfo.js
share/qtcreator/qbs/share/qbs/imports/qbs/Probes/BinaryProbe.qbs
share/qtcreator/qbs/share/qbs/imports/qbs/Probes/FrameworkProbe.qbs
share/qtcreator/qbs/share/qbs/imports/qbs/Probes/IncludeProbe.qbs
share/qtcreator/qbs/share/qbs/imports/qbs/Probes/PathProbe.qbs
share/qtcreator/qbs/share/qbs/imports/qbs/Probes/PkgConfigProbe.qbs
share/qtcreator/qbs/share/qbs/imports/qbs/Probes/utils.js
share/qtcreator/qbs/share/qbs/imports/qbs/base/Application.qbs
share/qtcreator/qbs/share/qbs/imports/qbs/base/CppApplication.qbs
share/qtcreator/qbs/share/qbs/imports/qbs/base/DynamicLibrary.qbs
share/qtcreator/qbs/share/qbs/imports/qbs/base/QmlApp.qbs
share/qtcreator/qbs/share/qbs/imports/qbs/base/StaticLibrary.qbs
share/qtcreator/qbs/share/qbs/imports/qbs/base/qmlapplicationviewer/qmlapplicationviewer.h
share/qtcreator/qbs/share/qbs/imports/qbs/base/qmlapplicationviewer/qmlapplicationviewer_qt4.cpp
share/qtcreator/qbs/share/qbs/imports/qbs/base/qmlapplicationviewer/qmlapplicationviewer_qt4.h
share/qtcreator/qbs/share/qbs/imports/qbs/base/qmlapplicationviewer/qmlapplicationviewer_qt5.cpp
share/qtcreator/qbs/share/qbs/imports/qbs/base/qmlapplicationviewer/qmlapplicationviewer_qt5.h
share/qtcreator/qbs/share/qbs/modules/Qt/QtModule.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/axcontainer/axcontainer.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/axserver/axserver.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/concurrent/concurrent.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/core/core.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/core/moc.js
share/qtcreator/qbs/share/qbs/modules/Qt/dbus/dbus.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/declarative/declarative.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/designer/designer.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/designercomponents/designercomponents.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/enginio/enginio.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/gui/gui.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/help/help.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/jsonstream/jsonstream.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/multimedia/multimedia.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/multimediawidgets/multimediawidgets.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/network/network.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/opengl/opengl.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/phonon/phonon.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/printsupport/printsupport.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/qml/qml.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/qtfunctions.js
share/qtcreator/qbs/share/qbs/modules/Qt/quick/quick.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/script/script.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/sql/sql.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/svg/svg.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/test/test.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/webkit/webkit.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/webkitwidgets/webkitwidgets.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/widgets/widgets.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/xml/xml.qbs
share/qtcreator/qbs/share/qbs/modules/Qt/xmlpatterns/xmlpatterns.qbs
share/qtcreator/qbs/share/qbs/modules/cpp/CppModule.qbs
share/qtcreator/qbs/share/qbs/modules/cpp/DarwinGCC.qbs
share/qtcreator/qbs/share/qbs/modules/cpp/GenericGCC.qbs
share/qtcreator/qbs/share/qbs/modules/cpp/UnixGCC.qbs
share/qtcreator/qbs/share/qbs/modules/cpp/bundle-tools.js
share/qtcreator/qbs/share/qbs/modules/cpp/darwin-tools.js
share/qtcreator/qbs/share/qbs/modules/cpp/gcc.js
share/qtcreator/qbs/share/qbs/modules/cpp/genericunix-gcc.qbs
share/qtcreator/qbs/share/qbs/modules/cpp/ios-gcc.qbs
share/qtcreator/qbs/share/qbs/modules/cpp/linux-gcc.qbs
share/qtcreator/qbs/share/qbs/modules/cpp/msvc.js
share/qtcreator/qbs/share/qbs/modules/cpp/osx-gcc.qbs
share/qtcreator/qbs/share/qbs/modules/cpp/path-tools.js
share/qtcreator/qbs/share/qbs/modules/cpp/windows-mingw.qbs
share/qtcreator/qbs/share/qbs/modules/cpp/windows-msvc.qbs
share/qtcreator/qbs/share/qbs/modules/cpp/windows.js
share/qtcreator/qbs/share/qbs/modules/qbs/common.qbs
share/qtcreator/qbs/share/qbs/modules/utils.js
share/qtcreator/qml-type-descriptions/builtins.qmltypes share/qtcreator/qml-type-descriptions/builtins.qmltypes
share/qtcreator/qml-type-descriptions/qbs-bundle.json
share/qtcreator/qml-type-descriptions/qmlproject-bundle.json
share/qtcreator/qml-type-descriptions/qmlproject.qmltypes share/qtcreator/qml-type-descriptions/qmlproject.qmltypes
share/qtcreator/qml-type-descriptions/qmlruntime.qmltypes share/qtcreator/qml-type-descriptions/qmlruntime.qmltypes
share/qtcreator/qml-type-descriptions/qmltypes-bundle.json
share/qtcreator/qml-type-descriptions/qt-labs-folderlistmodel.qmltypes share/qtcreator/qml-type-descriptions/qt-labs-folderlistmodel.qmltypes
share/qtcreator/qml-type-descriptions/qt-labs-gestures.qmltypes share/qtcreator/qml-type-descriptions/qt-labs-gestures.qmltypes
share/qtcreator/qml-type-descriptions/qt-labs-particles.qmltypes share/qtcreator/qml-type-descriptions/qt-labs-particles.qmltypes
share/qtcreator/qml-type-descriptions/qt4QtQuick1-bundle.json
share/qtcreator/qml-type-descriptions/qt5QtQuick1-bundle.json
share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json
share/qtcreator/qml-type-descriptions/qtmobility-connectivity.qmltypes share/qtcreator/qml-type-descriptions/qtmobility-connectivity.qmltypes
share/qtcreator/qml-type-descriptions/qtmobility-contacts.qmltypes share/qtcreator/qml-type-descriptions/qtmobility-contacts.qmltypes
share/qtcreator/qml-type-descriptions/qtmobility-feedback.qmltypes share/qtcreator/qml-type-descriptions/qtmobility-feedback.qmltypes
@ -393,6 +471,10 @@ share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.cpp
share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.h share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.h
share/qtcreator/qml/qmlpuppet/commands/createscenecommand.cpp share/qtcreator/qml/qmlpuppet/commands/createscenecommand.cpp
share/qtcreator/qml/qmlpuppet/commands/createscenecommand.h share/qtcreator/qml/qmlpuppet/commands/createscenecommand.h
share/qtcreator/qml/qmlpuppet/commands/debugoutputcommand.cpp
share/qtcreator/qml/qmlpuppet/commands/debugoutputcommand.h
share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.cpp share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.cpp
share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.h share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.h
share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.cpp share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.cpp
@ -401,6 +483,8 @@ share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.cpp
share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h
share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.cpp share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.cpp
share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.h share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.h
share/qtcreator/qml/qmlpuppet/commands/removesharedmemorycommand.cpp
share/qtcreator/qml/qmlpuppet/commands/removesharedmemorycommand.h
share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.cpp share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.cpp
share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.h share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.h
share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.cpp share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.cpp
@ -433,44 +517,49 @@ share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
share/qtcreator/qml/qmlpuppet/html/welcome.html share/qtcreator/qml/qmlpuppet/html/welcome.html
share/qtcreator/qml/qmlpuppet/images/template_image.png share/qtcreator/qml/qmlpuppet/images/template_image.png
share/qtcreator/qml/qmlpuppet/images/webkit.png share/qtcreator/qml/qmlpuppet/images/webkit.png
share/qtcreator/qml/qmlpuppet/instances/anchorchangesnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/instances/anchorchangesnodeinstance.h
share/qtcreator/qml/qmlpuppet/instances/behaviornodeinstance.cpp
share/qtcreator/qml/qmlpuppet/instances/behaviornodeinstance.h
share/qtcreator/qml/qmlpuppet/instances/childrenchangeeventfilter.cpp
share/qtcreator/qml/qmlpuppet/instances/childrenchangeeventfilter.h
share/qtcreator/qml/qmlpuppet/instances/componentnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/instances/componentnodeinstance.h
share/qtcreator/qml/qmlpuppet/instances/dummycontextobject.cpp
share/qtcreator/qml/qmlpuppet/instances/dummycontextobject.h
share/qtcreator/qml/qmlpuppet/instances/dummynodeinstance.cpp
share/qtcreator/qml/qmlpuppet/instances/dummynodeinstance.h
share/qtcreator/qml/qmlpuppet/instances/instances.pri share/qtcreator/qml/qmlpuppet/instances/instances.pri
share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp
share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h
share/qtcreator/qml/qmlpuppet/instances/nodeinstancemetaobject.cpp
share/qtcreator/qml/qmlpuppet/instances/nodeinstancemetaobject.h
share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp
share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.h
share/qtcreator/qml/qmlpuppet/instances/nodeinstancesignalspy.cpp
share/qtcreator/qml/qmlpuppet/instances/nodeinstancesignalspy.h
share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
share/qtcreator/qml/qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/instances/qmlpropertychangesnodeinstance.h
share/qtcreator/qml/qmlpuppet/instances/qmlstatenodeinstance.cpp
share/qtcreator/qml/qmlpuppet/instances/qmlstatenodeinstance.h
share/qtcreator/qml/qmlpuppet/instances/qmltransitionnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/instances/qmltransitionnodeinstance.h
share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.cpp
share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.h
share/qtcreator/qml/qmlpuppet/interfaces/commondefines.h share/qtcreator/qml/qmlpuppet/interfaces/commondefines.h
share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceclientinterface.h share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceclientinterface.h
share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceglobal.h
share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.cpp share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.cpp
share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.h share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.h
share/qtcreator/qml/qmlpuppet/qml2puppet/Info.plist.in share/qtcreator/qml/qmlpuppet/qml2puppet/Info.plist.in
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/childrenchangeeventfilter.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/childrenchangeeventfilter.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummycontextobject.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummycontextobject.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp
@ -481,20 +570,50 @@ share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.h share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickwindownodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickwindownodeinstance.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h
share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro
share/qtcreator/qml/qmlpuppet/qmlpuppet.pro share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet.qrc share/qtcreator/qml/qmlpuppet/qmlpuppet.qrc
share/qtcreator/qml/qmlpuppet/qmlpuppet/Info.plist.in share/qtcreator/qml/qmlpuppet/qmlpuppet/Info.plist.in
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/behaviornodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/behaviornodeinstance.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/childrenchangeeventfilter.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/childrenchangeeventfilter.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/componentnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/componentnodeinstance.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummycontextobject.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummycontextobject.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.cpp share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.h share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/instances.pri share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/instances.pri
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstancemetaobject.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstancemetaobject.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstancesignalspy.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstancesignalspy.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/positionernodeinstance.cpp share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/positionernodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/positionernodeinstance.h share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/positionernodeinstance.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.cpp share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.h share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlstatenodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlstatenodeinstance.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmltransitionnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmltransitionnodeinstance.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.cpp share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.h share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.cpp share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.cpp
@ -505,144 +624,158 @@ share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4previewnodeinstanceserver.c
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4previewnodeinstanceserver.h share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4previewnodeinstanceserver.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4rendernodeinstanceserver.cpp share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4rendernodeinstanceserver.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4rendernodeinstanceserver.h share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4rendernodeinstanceserver.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/main.cpp share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/servernodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/servernodeinstance.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri
share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro
share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppetmain.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet_utilities.pri share/qtcreator/qml/qmlpuppet/qmlpuppet_utilities.pri
share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentHorizontalButtons.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/AlignmentHorizontalButtons.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentVerticalButtons.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/AlignmentVerticalButtons.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/AnchorBox.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorButtons.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/AnchorButtons.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/CheckBox.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/ColorGroupBox.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/ColorLabel.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/ColorLabel.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/ColorLineEdit.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/ColorScheme.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/ColorScheme.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/ColorTypeButtons.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/ColorTypeButtons.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/ComboBox.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/DoubleSpinBox.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBoxAlternate.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/DoubleSpinBoxAlternate.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/ExpressionEditor.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/Extended.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/ExtendedFunctionButton.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/ExtendedPane.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/ExtendedSwitches.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/FlagedButton.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/FlagedButton.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableGroupBox.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/FontComboBox.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/FontGroupBox.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/FlipableSpecifics.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/FontStyleButtons.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/FlowSpecifics.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/Geometry.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/GroupBox.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/GroupBoxOption.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/FontStyleButtons.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/HorizontalLayout.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/HorizontalWhiteLine.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/GridSpecifics.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/IntEditor.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/GridViewSpecifics.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/Label.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/Layout.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/LayoutPane.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLayout.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/LineEdit.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalWhiteLine.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/Modifiers.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/PlaceHolder.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/PropertyFrame.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/ScrollArea.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/Label.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/SliderWidget.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/SpinBox.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/StandardTextColorGroupBox.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/StandardTextGroupBox.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/Switches.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/TextEditor.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/MouseAreaSpecifics.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/TextInputGroupBox.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/PathViewSpecifics.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/Transformation.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/PlaceHolder.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/Type.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/PropertyFrame.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/UrlEdit.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/VerticalLayout.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/Visibility.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/RowSpecifics.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/anchorbottom.css
share/qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/anchorbox.css
share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/anchorfill.css
share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/anchorhorizontal.css
share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/anchorleft.css
share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/anchorright.css
share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/anchorspacer.css
share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/anchortop.css
share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditor.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/anchorvertical.css
share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/applybutton.css
share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputSpecifics.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/aspectlock.css
share/qtcreator/qmldesigner/propertyeditor/Qt/TextSpecifics.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/cancelbutton.css
share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/checkbox_tr.css
share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/alignmentbottom-h-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/VerticalLayout.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/alignmentbottom-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/alignmentcenterh-h-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/anchorbottom.css share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/alignmentcenterh-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/anchorbox.css share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/alignmentleft-h-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/anchorfill.css share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/alignmentleft-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/anchorhorizontal.css share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/alignmentmiddle-h-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/anchorleft.css share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/alignmentmiddle-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/anchorright.css share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/alignmentright-h-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/anchorspacer.css share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/alignmentright-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/anchortop.css share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/alignmenttop-h-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/anchorvertical.css share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/alignmenttop-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/applybutton.css share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/apply.png
share/qtcreator/qmldesigner/propertyeditor/Qt/aspectlock.css share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/behaivour.png
share/qtcreator/qmldesigner/propertyeditor/Qt/cancelbutton.css share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/blended-image-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/checkbox_tr.css share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/bold-h-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/emptyPane.qml share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/bold-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentbottom-h-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/button.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentbottom-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/cancel.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentcenterh-h-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/default-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentcenterh-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/downArrow.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentleft-h-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/expression.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentleft-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/extended.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentmiddle-h-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/grid-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentmiddle-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/icon_color_gradient.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentright-h-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/icon_color_none.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentright-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/icon_color_solid.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmenttop-h-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/image-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmenttop-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/italic-h-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/apply.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/italic-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/behaivour.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/item-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/blended-image-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/layout.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/bold-h-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/leftArrow.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/bold-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/list-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/button.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/mouse-area-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/cancel.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/placeholder.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/default-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/rect-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/downArrow.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/reset-button.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/expression.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/rightArrow.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/extended.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/standard.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/grid-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/strikeout-h-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/icon_color_gradient.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/strikeout-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/icon_color_none.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/submenu.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/icon_color_solid.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/text-edit-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/image-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/text-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/italic-h-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/underline-h-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/italic-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/underline-icon.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/item-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images/upArrow.png
share/qtcreator/qmldesigner/propertyeditor/Qt/images/layout.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/layoutWidget.css
share/qtcreator/qmldesigner/propertyeditor/Qt/images/leftArrow.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/propertyEditor.css
share/qtcreator/qmldesigner/propertyeditor/Qt/images/list-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/qmldir
share/qtcreator/qmldesigner/propertyeditor/Qt/images/mouse-area-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/specialCheckBox.css
share/qtcreator/qmldesigner/propertyeditor/Qt/images/placeholder.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/styledbuttonleft.css
share/qtcreator/qmldesigner/propertyeditor/Qt/images/rect-icon.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/styledbuttonmiddle.css
share/qtcreator/qmldesigner/propertyeditor/Qt/images/reset-button.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/styledbuttonright.css
share/qtcreator/qmldesigner/propertyeditor/Qt/images/rightArrow.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/switch.css
share/qtcreator/qmldesigner/propertyeditor/Qt/images/standard.png share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/typeLabel.css
share/qtcreator/qmldesigner/propertyeditor/Qt/images/strikeout-h-icon.png share/qtcreator/qmldesigner/propertyeditor/PropertyTemplates/BooleanEditorTemplate.template
share/qtcreator/qmldesigner/propertyeditor/Qt/images/strikeout-icon.png share/qtcreator/qmldesigner/propertyeditor/PropertyTemplates/ColorEditorTemplate.template
share/qtcreator/qmldesigner/propertyeditor/Qt/images/submenu.png share/qtcreator/qmldesigner/propertyeditor/PropertyTemplates/IntEditorTemplate.template
share/qtcreator/qmldesigner/propertyeditor/Qt/images/text-edit-icon.png share/qtcreator/qmldesigner/propertyeditor/PropertyTemplates/RealEditorTemplate.template
share/qtcreator/qmldesigner/propertyeditor/Qt/images/text-icon.png share/qtcreator/qmldesigner/propertyeditor/PropertyTemplates/StringEditorTemplate.template
share/qtcreator/qmldesigner/propertyeditor/Qt/images/underline-h-icon.png share/qtcreator/qmldesigner/propertyeditor/PropertyTemplates/TemplateTypes.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/images/underline-icon.png share/qtcreator/qmldesigner/propertyeditor/PropertyTemplates/UrlEditorTemplate.template
share/qtcreator/qmldesigner/propertyeditor/Qt/images/upArrow.png share/qtcreator/qmldesigner/propertyeditor/QtQuick/BorderImageSpecifics.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/layoutWidget.css share/qtcreator/qmldesigner/propertyeditor/QtQuick/FlickableGroupBox.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css share/qtcreator/qmldesigner/propertyeditor/QtQuick/FlickableSpecifics.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/specialCheckBox.css share/qtcreator/qmldesigner/propertyeditor/QtQuick/FlipableSpecifics.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/styledbuttonleft.css share/qtcreator/qmldesigner/propertyeditor/QtQuick/FlowSpecifics.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/styledbuttonmiddle.css share/qtcreator/qmldesigner/propertyeditor/QtQuick/GridSpecifics.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/styledbuttonright.css share/qtcreator/qmldesigner/propertyeditor/QtQuick/GridViewSpecifics.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/switch.css share/qtcreator/qmldesigner/propertyeditor/QtQuick/ImageSpecifics.qml
share/qtcreator/qmldesigner/propertyeditor/Qt/typeLabel.css share/qtcreator/qmldesigner/propertyeditor/QtQuick/ItemPane.qml
share/qtcreator/qmldesigner/propertyeditor/QtQuick/ListViewSpecifics.qml
share/qtcreator/qmldesigner/propertyeditor/QtQuick/MouseAreaSpecifics.qml
share/qtcreator/qmldesigner/propertyeditor/QtQuick/PathViewSpecifics.qml
share/qtcreator/qmldesigner/propertyeditor/QtQuick/QtObjectPane.qml
share/qtcreator/qmldesigner/propertyeditor/QtQuick/RectangleColorGroupBox.qml
share/qtcreator/qmldesigner/propertyeditor/QtQuick/RectangleSpecifics.qml
share/qtcreator/qmldesigner/propertyeditor/QtQuick/RowSpecifics.qml
share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextEditSpecifics.qml
share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextInputSpecifics.qml
share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextSpecifics.qml
share/qtcreator/qmldesigner/propertyeditor/QtQuick/Window/WindowPane.qml
share/qtcreator/qmldesigner/propertyeditor/QtQuick/emptyPane.qml
share/qtcreator/qmldesigner/propertyeditor/QtWebKit/WebViewSpecifics.qml share/qtcreator/qmldesigner/propertyeditor/QtWebKit/WebViewSpecifics.qml
share/qtcreator/qmlicons/Qt/16x16/BorderImage.png share/qtcreator/qmlicons/Qt/16x16/BorderImage.png
share/qtcreator/qmlicons/Qt/16x16/BusyIndicator.png share/qtcreator/qmlicons/Qt/16x16/BusyIndicator.png
@ -733,6 +866,15 @@ share/qtcreator/templates/mobileapp/main.cpp
share/qtcreator/templates/mobileapp/mainwindow.cpp share/qtcreator/templates/mobileapp/mainwindow.cpp
share/qtcreator/templates/mobileapp/mainwindow.h share/qtcreator/templates/mobileapp/mainwindow.h
share/qtcreator/templates/mobileapp/mainwindow.ui share/qtcreator/templates/mobileapp/mainwindow.ui
share/qtcreator/templates/qml/qtquick1_1/main.qml
share/qtcreator/templates/qml/qtquick1_1/main.qmlproject
share/qtcreator/templates/qml/qtquick1_1/template.xml
share/qtcreator/templates/qml/qtquick2/main.qml
share/qtcreator/templates/qml/qtquick2/main.qmlproject
share/qtcreator/templates/qml/qtquick2/template.xml
share/qtcreator/templates/qml/qtquickcontrols/main.qml
share/qtcreator/templates/qml/qtquickcontrols/main.qmlproject
share/qtcreator/templates/qml/qtquickcontrols/template.xml
share/qtcreator/templates/qt4project/customwidgetwizard/tpl_collection.cpp share/qtcreator/templates/qt4project/customwidgetwizard/tpl_collection.cpp
share/qtcreator/templates/qt4project/customwidgetwizard/tpl_collection.h share/qtcreator/templates/qt4project/customwidgetwizard/tpl_collection.h
share/qtcreator/templates/qt4project/customwidgetwizard/tpl_plugin.pro share/qtcreator/templates/qt4project/customwidgetwizard/tpl_plugin.pro
@ -771,6 +913,15 @@ share/qtcreator/templates/shared/manifest.aegis
share/qtcreator/templates/wizards/README.txt share/qtcreator/templates/wizards/README.txt
share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml
share/qtcreator/templates/wizards/bb-bardescriptor/wizard.xml share/qtcreator/templates/wizards/bb-bardescriptor/wizard.xml
share/qtcreator/templates/wizards/bb-cascades-app/assets/SecondPage.qml
share/qtcreator/templates/wizards/bb-cascades-app/assets/main.qml
share/qtcreator/templates/wizards/bb-cascades-app/bar-descriptor.xml
share/qtcreator/templates/wizards/bb-cascades-app/icon.png
share/qtcreator/templates/wizards/bb-cascades-app/main.cpp
share/qtcreator/templates/wizards/bb-cascades-app/project.cpp
share/qtcreator/templates/wizards/bb-cascades-app/project.hpp
share/qtcreator/templates/wizards/bb-cascades-app/project.pro
share/qtcreator/templates/wizards/bb-cascades-app/wizard.xml
share/qtcreator/templates/wizards/bb-guiapp/bar-descriptor.xml share/qtcreator/templates/wizards/bb-guiapp/bar-descriptor.xml
share/qtcreator/templates/wizards/bb-guiapp/icon.png share/qtcreator/templates/wizards/bb-guiapp/icon.png
share/qtcreator/templates/wizards/bb-guiapp/main.cpp share/qtcreator/templates/wizards/bb-guiapp/main.cpp
@ -789,18 +940,9 @@ 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/mainwidget.ui
share/qtcreator/templates/wizards/bb-qt5-guiapp/project.pro share/qtcreator/templates/wizards/bb-qt5-guiapp/project.pro
share/qtcreator/templates/wizards/bb-qt5-guiapp/wizard.xml share/qtcreator/templates/wizards/bb-qt5-guiapp/wizard.xml
share/qtcreator/templates/wizards/bb-qt5-quick2app/bar-descriptor.xml share/qtcreator/templates/wizards/codesnippet/main.cpp
share/qtcreator/templates/wizards/bb-qt5-quick2app/icon.png share/qtcreator/templates/wizards/codesnippet/project.pro
share/qtcreator/templates/wizards/bb-qt5-quick2app/main.cpp share/qtcreator/templates/wizards/codesnippet/wizard.xml
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/console.png
share/qtcreator/templates/wizards/helloworld/main.cpp share/qtcreator/templates/wizards/helloworld/main.cpp
share/qtcreator/templates/wizards/helloworld/project.pro share/qtcreator/templates/wizards/helloworld/project.pro
@ -828,6 +970,7 @@ share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec.in
share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp
share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.h share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.h
share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro
share/qtcreator/templates/wizards/qtcreatorplugin/myplugin_dependencies.pri
share/qtcreator/templates/wizards/qtcreatorplugin/myplugin_global.h share/qtcreator/templates/wizards/qtcreatorplugin/myplugin_global.h
share/qtcreator/templates/wizards/qtcreatorplugin/mypluginconstants.h share/qtcreator/templates/wizards/qtcreatorplugin/mypluginconstants.h
share/qtcreator/templates/wizards/qtcreatorplugin/qtcreator_logo_24.png share/qtcreator/templates/wizards/qtcreatorplugin/qtcreator_logo_24.png
@ -873,6 +1016,7 @@ share/qtcreator/welcomescreen/qtcreator_tutorials.xml
share/qtcreator/welcomescreen/tutorials.qml share/qtcreator/welcomescreen/tutorials.qml
share/qtcreator/welcomescreen/welcomescreen.qml share/qtcreator/welcomescreen/welcomescreen.qml
share/qtcreator/welcomescreen/welcomescreen.qmlproject share/qtcreator/welcomescreen/welcomescreen.qmlproject
share/qtcreator/welcomescreen/widgets/ComboBox.qml
share/qtcreator/welcomescreen/widgets/CustomColors.qml share/qtcreator/welcomescreen/widgets/CustomColors.qml
share/qtcreator/welcomescreen/widgets/CustomFonts.qml share/qtcreator/welcomescreen/widgets/CustomFonts.qml
share/qtcreator/welcomescreen/widgets/CustomTab.qml share/qtcreator/welcomescreen/widgets/CustomTab.qml
@ -966,13 +1110,12 @@ share/qtcreator/welcomescreen/widgets/qmldir
@dirrm share/qtcreator/templates/wizards/plaincapp @dirrm share/qtcreator/templates/wizards/plaincapp
@dirrm share/qtcreator/templates/wizards/listmodel @dirrm share/qtcreator/templates/wizards/listmodel
@dirrm share/qtcreator/templates/wizards/helloworld @dirrm share/qtcreator/templates/wizards/helloworld
@dirrm share/qtcreator/templates/wizards/bb-quickapp/qml @dirrm share/qtcreator/templates/wizards/codesnippet
@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-guiapp
@dirrm share/qtcreator/templates/wizards/bb-qt5-bardescriptor @dirrm share/qtcreator/templates/wizards/bb-qt5-bardescriptor
@dirrm share/qtcreator/templates/wizards/bb-guiapp @dirrm share/qtcreator/templates/wizards/bb-guiapp
@dirrm share/qtcreator/templates/wizards/bb-cascades-app/assets
@dirrm share/qtcreator/templates/wizards/bb-cascades-app
@dirrm share/qtcreator/templates/wizards/bb-bardescriptor @dirrm share/qtcreator/templates/wizards/bb-bardescriptor
@dirrm share/qtcreator/templates/wizards @dirrm share/qtcreator/templates/wizards
@dirrm share/qtcreator/templates/shared @dirrm share/qtcreator/templates/shared
@ -989,6 +1132,10 @@ share/qtcreator/welcomescreen/widgets/qmldir
@dirrm share/qtcreator/templates/qtquick2app @dirrm share/qtcreator/templates/qtquick2app
@dirrm share/qtcreator/templates/qt4project/customwidgetwizard @dirrm share/qtcreator/templates/qt4project/customwidgetwizard
@dirrm share/qtcreator/templates/qt4project @dirrm share/qtcreator/templates/qt4project
@dirrm share/qtcreator/templates/qml/qtquickcontrols
@dirrm share/qtcreator/templates/qml/qtquick2
@dirrm share/qtcreator/templates/qml/qtquick1_1
@dirrm share/qtcreator/templates/qml
@dirrm share/qtcreator/templates/mobileapp @dirrm share/qtcreator/templates/mobileapp
@dirrm share/qtcreator/templates/html5app/html5applicationviewer/touchnavigation @dirrm share/qtcreator/templates/html5app/html5applicationviewer/touchnavigation
@dirrm share/qtcreator/templates/html5app/html5applicationviewer @dirrm share/qtcreator/templates/html5app/html5applicationviewer
@ -1004,8 +1151,11 @@ share/qtcreator/welcomescreen/widgets/qmldir
@dirrm share/qtcreator/qmlicons/Qt @dirrm share/qtcreator/qmlicons/Qt
@dirrm share/qtcreator/qmlicons @dirrm share/qtcreator/qmlicons
@dirrm share/qtcreator/qmldesigner/propertyeditor/QtWebKit @dirrm share/qtcreator/qmldesigner/propertyeditor/QtWebKit
@dirrm share/qtcreator/qmldesigner/propertyeditor/Qt/images @dirrm share/qtcreator/qmldesigner/propertyeditor/QtQuick/Window
@dirrm share/qtcreator/qmldesigner/propertyeditor/Qt @dirrm share/qtcreator/qmldesigner/propertyeditor/QtQuick
@dirrm share/qtcreator/qmldesigner/propertyeditor/PropertyTemplates
@dirrm share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/images
@dirrm share/qtcreator/qmldesigner/propertyeditor/HelperWidgets
@dirrm share/qtcreator/qmldesigner/propertyeditor @dirrm share/qtcreator/qmldesigner/propertyeditor
@dirrm share/qtcreator/qmldesigner @dirrm share/qtcreator/qmldesigner
@dirrm share/qtcreator/qml/qmlpuppet/qmlpuppet/instances @dirrm share/qtcreator/qml/qmlpuppet/qmlpuppet/instances
@ -1031,6 +1181,51 @@ share/qtcreator/welcomescreen/widgets/qmldir
@dirrm share/qtcreator/qml/qmldump @dirrm share/qtcreator/qml/qmldump
@dirrm share/qtcreator/qml-type-descriptions @dirrm share/qtcreator/qml-type-descriptions
@dirrm share/qtcreator/qml @dirrm share/qtcreator/qml
@dirrm share/qtcreator/qbs/share/qbs/modules/qbs
@dirrm share/qtcreator/qbs/share/qbs/modules/cpp
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/xmlpatterns
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/xml
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/widgets
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/webkitwidgets
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/webkit
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/test
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/svg
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/sql
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/script
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/quick
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/qml
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/printsupport
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/phonon
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/opengl
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/network
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/multimediawidgets
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/multimedia
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/jsonstream
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/help
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/gui
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/enginio
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/designercomponents
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/designer
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/declarative
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/dbus
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/core
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/concurrent
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/axserver
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt/axcontainer
@dirrm share/qtcreator/qbs/share/qbs/modules/Qt
@dirrm share/qtcreator/qbs/share/qbs/modules
@dirrm share/qtcreator/qbs/share/qbs/imports/qbs/base/qmlapplicationviewer
@dirrm share/qtcreator/qbs/share/qbs/imports/qbs/base
@dirrm share/qtcreator/qbs/share/qbs/imports/qbs/Probes
@dirrm share/qtcreator/qbs/share/qbs/imports/qbs/FileInfo
@dirrm share/qtcreator/qbs/share/qbs/imports/qbs
@dirrm share/qtcreator/qbs/share/qbs/imports
@dirrm share/qtcreator/qbs/share/qbs
@dirrm share/qtcreator/qbs/share
@dirrm share/qtcreator/qbs/lib/qbs/plugins
@dirrm share/qtcreator/qbs/lib/qbs
@dirrm share/qtcreator/qbs/lib
@dirrm share/qtcreator/qbs
@dirrm share/qtcreator/glsl @dirrm share/qtcreator/glsl
@dirrm share/qtcreator/generic-highlighter @dirrm share/qtcreator/generic-highlighter
@dirrm share/qtcreator/externaltools @dirrm share/qtcreator/externaltools
@ -1065,7 +1260,7 @@ share/qtcreator/welcomescreen/widgets/qmldir
@dirrm lib/qtcreator/qtcomponents/custom @dirrm lib/qtcreator/qtcomponents/custom
@dirrm lib/qtcreator/qtcomponents @dirrm lib/qtcreator/qtcomponents
@dirrm lib/qtcreator/qmldesigner @dirrm lib/qtcreator/qmldesigner
@dirrm lib/qtcreator/plugins/RIM
@dirrm lib/qtcreator/plugins/QtProject @dirrm lib/qtcreator/plugins/QtProject
@dirrm lib/qtcreator/plugins/BlackBerry
@dirrm lib/qtcreator/plugins @dirrm lib/qtcreator/plugins
@dirrm lib/qtcreator @dirrm lib/qtcreator

5
graphics/qt4-iconengines/Makefile
View file

@ -13,6 +13,8 @@ USE_QT4= qmake_build moc_build corelib gui svg xml
QT_NONSTANDARD= yes QT_NONSTANDARD= yes
QT_DIST= yes QT_DIST= yes
USES= pkgconfig
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
ALL_TARGET= first ALL_TARGET= first
@ -35,9 +37,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/svgiconengine BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/svgiconengine
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

5
graphics/qt4-imageformats/Makefile
View file

@ -18,6 +18,8 @@ USE_QT4= qmake_build moc_build rcc_build corelib gui svg xml
QT_NONSTANDARD= yes QT_NONSTANDARD= yes
QT_DIST= yes QT_DIST= yes
USES= pkgconfig
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
ALL_TARGET= first ALL_TARGET= first
@ -40,9 +42,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

35
graphics/qt4-imageformats/files/patch-git_ccd1b2ee
View file

@ -1,35 +0,0 @@
commit ccd1b2ee01c193cd157978c1f9f08f87d0f9c94b
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Fri May 10 01:40:23 2013 +0300
Check that 3DNow! instructions are supported before including mm3dnow.h.
Include mm3dnow.h the way we already include the (S)SSE{3,4} and AVX
instruction headers: by checking that the compiler is set to support those
instructions besides verifying that QT_HAVE_3DNOW evalues to true (which
only means the compiler supported them when the build was being configured).
This has not caused a problem in most cases so far because GCC protects its
mm3dnow.h header with an #ifdef __3dNOW__ (contrary to what it does on, say,
pmmintrin.h). clang's mm3dnow.h, on the other hand, does not have that check
and can fail if -march is set to, for example, i386 or i486.
Not backported from qt5 because qtbase because qsimd_p.h does not include
the 3DNow! headers after commit a1b30b49ef09bef2e97b9a0622bf7ad622678fee.
Change-Id: I15ab5e936c71c55f89c3f25777ab27fbd262e9cd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
index 87e26e1..6a32e8f 100644
--- ./src/corelib/tools/qsimd_p.h
+++ ./src/corelib/tools/qsimd_p.h
@@ -199,7 +199,7 @@ QT_BEGIN_HEADER
#endif
// 3D now intrinsics
-#if defined(QT_HAVE_3DNOW)
+#if defined(QT_HAVE_3DNOW) && (defined(__3dNOW__) || defined(Q_CC_MSVC))
#include <mm3dnow.h>
#endif

3
graphics/qt4-pixeltool/Makefile
View file

@ -40,9 +40,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \ ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \
${BUILD_WRKSRC}/${PORTNAME}.pro ${BUILD_WRKSRC}/${PORTNAME}.pro

3
graphics/qt4-svg/Makefile
View file

@ -36,9 +36,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

35
graphics/qt4-svg/files/patch-git_ccd1b2ee
View file

@ -1,35 +0,0 @@
commit ccd1b2ee01c193cd157978c1f9f08f87d0f9c94b
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Fri May 10 01:40:23 2013 +0300
Check that 3DNow! instructions are supported before including mm3dnow.h.
Include mm3dnow.h the way we already include the (S)SSE{3,4} and AVX
instruction headers: by checking that the compiler is set to support those
instructions besides verifying that QT_HAVE_3DNOW evalues to true (which
only means the compiler supported them when the build was being configured).
This has not caused a problem in most cases so far because GCC protects its
mm3dnow.h header with an #ifdef __3dNOW__ (contrary to what it does on, say,
pmmintrin.h). clang's mm3dnow.h, on the other hand, does not have that check
and can fail if -march is set to, for example, i386 or i486.
Not backported from qt5 because qtbase because qsimd_p.h does not include
the 3DNow! headers after commit a1b30b49ef09bef2e97b9a0622bf7ad622678fee.
Change-Id: I15ab5e936c71c55f89c3f25777ab27fbd262e9cd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
index 87e26e1..6a32e8f 100644
--- ./src/corelib/tools/qsimd_p.h
+++ ./src/corelib/tools/qsimd_p.h
@@ -199,7 +199,7 @@ QT_BEGIN_HEADER
#endif
// 3D now intrinsics
-#if defined(QT_HAVE_3DNOW)
+#if defined(QT_HAVE_3DNOW) && (defined(__3dNOW__) || defined(Q_CC_MSVC))
#include <mm3dnow.h>
#endif

3
japanese/qt4-codecs-jp/Makefile
View file

@ -37,9 +37,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/jp BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/jp
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

3
korean/qt4-codecs-kr/Makefile
View file

@ -36,9 +36,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/kr BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/kr
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

8
misc/qt4-doc/Makefile
View file

@ -17,10 +17,10 @@ EXTRACT_AFTER_ARGS= '${DISTNAME}/doc'
DOCSDIR= ${PREFIX}/share/doc/qt4 DOCSDIR= ${PREFIX}/share/doc/qt4
NO_STAGE= yes
do-install: do-install:
${MKDIR} ${DOCSDIR} && \ ${MKDIR} ${STAGEDIR}${DOCSDIR} && \
cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${DOCSDIR} && \ cd ${WRKSRC}/doc && \
${COPYTREE_SHARE} qch ${DOCSDIR} ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR} && \
${COPYTREE_SHARE} qch ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk> .include <bsd.port.mk>

3
misc/qt4-doc/pkg-plist
View file

@ -3078,7 +3078,6 @@
%%DOCSDIR%%/html/images/qvbox-m.png %%DOCSDIR%%/html/images/qvbox-m.png
%%DOCSDIR%%/html/images/qvboxlayout-with-5-children.png %%DOCSDIR%%/html/images/qvboxlayout-with-5-children.png
%%DOCSDIR%%/html/images/qwebview-diagram.png %%DOCSDIR%%/html/images/qwebview-diagram.png
%%DOCSDIR%%/html/images/qwebview-url.png
%%DOCSDIR%%/html/images/qwindowsstyle.png %%DOCSDIR%%/html/images/qwindowsstyle.png
%%DOCSDIR%%/html/images/qwindowsxpstyle.png %%DOCSDIR%%/html/images/qwindowsxpstyle.png
%%DOCSDIR%%/html/images/qwsserver_keyboardfilter.png %%DOCSDIR%%/html/images/qwsserver_keyboardfilter.png
@ -7364,7 +7363,6 @@
%%DOCSDIR%%/html/stylesheet.html %%DOCSDIR%%/html/stylesheet.html
%%DOCSDIR%%/html/supported-platforms.html %%DOCSDIR%%/html/supported-platforms.html
%%DOCSDIR%%/html/symbian-platform-security-requirements.html %%DOCSDIR%%/html/symbian-platform-security-requirements.html
%%DOCSDIR%%/html/symbian-support.html
%%DOCSDIR%%/html/symbian-with-qt-introduction.html %%DOCSDIR%%/html/symbian-with-qt-introduction.html
%%DOCSDIR%%/html/symbianexceptionsafety.html %%DOCSDIR%%/html/symbianexceptionsafety.html
%%DOCSDIR%%/html/technology-apis.html %%DOCSDIR%%/html/technology-apis.html
@ -8148,7 +8146,6 @@
%%DOCSDIR%%/qch/qt.qch %%DOCSDIR%%/qch/qt.qch
@dirrm %%DOCSDIR%%/qch @dirrm %%DOCSDIR%%/qch
@dirrm %%DOCSDIR%%/html/style @dirrm %%DOCSDIR%%/html/style
@exec mkdir -p %D/%%DOCSDIR%%/html/scripts
@dirrm %%DOCSDIR%%/html/scripts @dirrm %%DOCSDIR%%/html/scripts
@dirrm %%DOCSDIR%%/html/images/used-in-examples/widgets/tooltips/images @dirrm %%DOCSDIR%%/html/images/used-in-examples/widgets/tooltips/images
@dirrm %%DOCSDIR%%/html/images/used-in-examples/widgets/tooltips @dirrm %%DOCSDIR%%/html/images/used-in-examples/widgets/tooltips

5
misc/qt4-l10n/Makefile
View file

@ -14,12 +14,11 @@ QT_NONSTANDARD= yes
EXTRACT_AFTER_ARGS+= --include '${DISTNAME}/translations' EXTRACT_AFTER_ARGS+= --include '${DISTNAME}/translations'
NO_STAGE= yes
do-build: do-build:
${LOCALBASE}/bin/lrelease-qt4 ${WRKSRC}/translations/*.ts ${LOCALBASE}/bin/lrelease-qt4 ${WRKSRC}/translations/*.ts
do-install: do-install:
${MKDIR} ${PREFIX}/share/qt4/translations ${MKDIR} ${STAGEDIR}${PREFIX}/share/qt4/translations
${INSTALL_DATA} ${WRKSRC}/translations/*.qm ${PREFIX}/share/qt4/translations ${INSTALL_DATA} ${WRKSRC}/translations/*.qm ${STAGEDIR}${PREFIX}/share/qt4/translations
.include <bsd.port.mk> .include <bsd.port.mk>

6
misc/qt4-qtconfig/Makefile
View file

@ -14,6 +14,7 @@ OPTIONS_DEFAULT=PHONON
PHONON_DESC= Multimedia via Phonon (implies GStreamer) PHONON_DESC= Multimedia via Phonon (implies GStreamer)
USES= pkgconfig
USE_QT4= qmake_build moc_build rcc_build uic_build \ USE_QT4= qmake_build moc_build rcc_build uic_build \
dbus gui xml dbus gui xml
QT_NONSTANDARD= yes QT_NONSTANDARD= yes
@ -41,7 +42,6 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \
EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
.endfor .endfor
NO_STAGE= yes
.include <bsd.port.options.mk> .include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MPHONON} .if ${PORT_OPTIONS:MPHONON}
@ -54,7 +54,7 @@ CONFIGURE_ARGS+=-no-phonon -no-gstreamer
BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
pre-configure: pre-configure:
${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=qtconfig-qt4|g' \ ${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=qtconfig-qt4|g' \
@ -68,6 +68,6 @@ pre-configure:
post-install: post-install:
${INSTALL_DATA} ${BUILD_WRKSRC}/images/appicon.png \ ${INSTALL_DATA} ${BUILD_WRKSRC}/images/appicon.png \
${PREFIX}/share/pixmaps/qtconfig-qt4.png ${STAGEDIR}${PREFIX}/share/pixmaps/qtconfig-qt4.png
.include <bsd.port.mk> .include <bsd.port.mk>

10
misc/qt4-qtdemo/Makefile
View file

@ -9,6 +9,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org
COMMENT= Qt demonstration and example programs COMMENT= Qt demonstration and example programs
USES= pkgconfig
USE_QT4= qmake_build moc_build rcc_build uic_build corelib designer \ USE_QT4= qmake_build moc_build rcc_build uic_build corelib designer \
gui network opengl sql svg qtestlib xml imageformats_run dbus \ gui network opengl sql svg qtestlib xml imageformats_run dbus \
script webkit phonon help assistant_run phonon-gst scripttools \ script webkit phonon help assistant_run phonon-gst scripttools \
@ -40,9 +41,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/demos BUILD_WRKSRC= ${WRKSRC}/demos
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
post-patch: post-patch:
${REINPLACE_CMD} -e '/app +=/s|"assistant"|"assistant-qt4"|' \ ${REINPLACE_CMD} -e '/app +=/s|"assistant"|"assistant-qt4"|' \
${BUILD_WRKSRC}/${PORTNAME}/menumanager.cpp \ ${BUILD_WRKSRC}/${PORTNAME}/menumanager.cpp \
@ -57,10 +57,10 @@ pre-configure:
${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc
post-build: post-build:
cd ${WRKSRC}/examples && ${SETENV} MAKEOBJDIR=. ${MAKE} cd ${WRKSRC}/examples && ${SETENV} MAKEOBJDIR=. ${MAKE} ${_MAKE_JOBS}
post-install: post-install:
cd ${WRKSRC}/examples && ${SETENV} MAKEOBJDIR=. ${MAKE} install cd ${WRKSRC}/examples && ${SETENV} MAKEOBJDIR=. ${MAKE} ${MAKE_ARGS} install
${FIND} -E ${PREFIX}/share/examples/qt4/examples/declarative/cppextensions -regex ".*\.(moc|obj|pch|rcc)" -type d | ${XARGS} ${RM} -r ${FIND} -E ${STAGEDIR}${PREFIX}/share/examples/qt4/examples/declarative/cppextensions -regex ".*\.(moc|obj|pch|rcc)" -type d | ${XARGS} ${RM} -r
.include <bsd.port.mk> .include <bsd.port.mk>

3
multimedia/qt4-multimedia/Makefile
View file

@ -35,9 +35,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

3
net/qt4-network/Makefile
View file

@ -39,9 +39,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

3
textproc/qt4-clucene/Makefile
View file

@ -36,9 +36,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/tools/assistant/lib/fulltextsearch BUILD_WRKSRC= ${WRKSRC}/tools/assistant/lib/fulltextsearch
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

3
textproc/qt4-xml/Makefile
View file

@ -36,9 +36,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

3
textproc/qt4-xmlpatterns-tool/Makefile
View file

@ -35,9 +35,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/tools/xmlpatterns BUILD_WRKSRC= ${WRKSRC}/tools/xmlpatterns
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
# ${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=xmlpatterns|g' \ # ${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=xmlpatterns|g' \

3
textproc/qt4-xmlpatterns/Makefile
View file

@ -36,9 +36,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

4
www/qt4-webkit/Makefile
View file

@ -3,7 +3,6 @@
PORTNAME= webkit PORTNAME= webkit
DISTVERSION= ${QT4_VERSION} DISTVERSION= ${QT4_VERSION}
PORTREVISION= 1
CATEGORIES?= www CATEGORIES?= www
PKGNAMEPREFIX= qt4- PKGNAMEPREFIX= qt4-
@ -40,14 +39,13 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC}
CONFIGURE_ARGS+= -I../../../../include/Qt -I../../../../include CONFIGURE_ARGS+= -I../../../../include/Qt -I../../../../include
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
OPTIONS_DEFINE= GSTREAMER OPTIONS_DEFINE= GSTREAMER
OPTIONS_DEFAULT= GSTREAMER OPTIONS_DEFAULT= GSTREAMER
GSTREAMER_DESC= HTML5 audio and video via GStreamer GSTREAMER_DESC= HTML5 audio and video via GStreamer
NO_STAGE= yes
.include <bsd.port.options.mk> .include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MGSTREAMER} .if ${PORT_OPTIONS:MGSTREAMER}

35
www/qt4-webkit/files/patch-git_ccd1b2ee
View file

@ -1,35 +0,0 @@
commit ccd1b2ee01c193cd157978c1f9f08f87d0f9c94b
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Fri May 10 01:40:23 2013 +0300
Check that 3DNow! instructions are supported before including mm3dnow.h.
Include mm3dnow.h the way we already include the (S)SSE{3,4} and AVX
instruction headers: by checking that the compiler is set to support those
instructions besides verifying that QT_HAVE_3DNOW evalues to true (which
only means the compiler supported them when the build was being configured).
This has not caused a problem in most cases so far because GCC protects its
mm3dnow.h header with an #ifdef __3dNOW__ (contrary to what it does on, say,
pmmintrin.h). clang's mm3dnow.h, on the other hand, does not have that check
and can fail if -march is set to, for example, i386 or i486.
Not backported from qt5 because qtbase because qsimd_p.h does not include
the 3DNow! headers after commit a1b30b49ef09bef2e97b9a0622bf7ad622678fee.
Change-Id: I15ab5e936c71c55f89c3f25777ab27fbd262e9cd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
index 87e26e1..6a32e8f 100644
--- ./src/corelib/tools/qsimd_p.h
+++ ./src/corelib/tools/qsimd_p.h
@@ -199,7 +199,7 @@ QT_BEGIN_HEADER
#endif
// 3D now intrinsics
-#if defined(QT_HAVE_3DNOW)
+#if defined(QT_HAVE_3DNOW) && (defined(__3dNOW__) || defined(Q_CC_MSVC))
#include <mm3dnow.h>
#endif

2
www/qt4-webkit/pkg-plist
View file

@ -64,7 +64,7 @@ lib/qt4/libQtWebKit.prl
lib/qt4/libQtWebKit.so lib/qt4/libQtWebKit.so
lib/qt4/libQtWebKit.so.4 lib/qt4/libQtWebKit.so.4
lib/qt4/libQtWebKit.so.4.9 lib/qt4/libQtWebKit.so.4.9
lib/qt4/libQtWebKit.so.4.9.3 lib/qt4/libQtWebKit.so.4.9.4
libdata/pkgconfig/QtWebKit.pc libdata/pkgconfig/QtWebKit.pc
share/qt4/mkspecs/modules/qt_webkit_version.pri share/qt4/mkspecs/modules/qt_webkit_version.pri
@dirrmtry share/qt4/mkspecs/modules @dirrmtry share/qt4/mkspecs/modules

6
x11-toolkits/qt4-gui/Makefile
View file

@ -46,12 +46,11 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC}
CONFIGURE_ARGS+= -I../../include/QtCore -I../../include/QtGui \ CONFIGURE_ARGS+= -I../../include/QtCore -I../../include/QtGui \
-I../../include/Qt -I../../include -I../../include/Qt -I../../include
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
FONTSCALE= ${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf FONTSCALE= ${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf
FONTENCOD= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir FONTENCOD= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir
NO_STAGE= yes
.include "${.CURDIR}/../../devel/qt4/files/Makefile.options" .include "${.CURDIR}/../../devel/qt4/files/Makefile.options"
.if ${QT4_OPTIONS:MCUPS} .if ${QT4_OPTIONS:MCUPS}
@ -101,7 +100,6 @@ post-configure:
post-install: post-install:
${INSTALL_DATA} ${BUILD_WRKSRC}/dialogs/images/qtlogo-64.png \ ${INSTALL_DATA} ${BUILD_WRKSRC}/dialogs/images/qtlogo-64.png \
${PREFIX}/share/pixmaps/qtlogo.png ${STAGEDIR}${PREFIX}/share/pixmaps/qtlogo.png
@${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

35
x11-toolkits/qt4-gui/files/patch-git_ccd1b2ee
View file

@ -1,35 +0,0 @@
commit ccd1b2ee01c193cd157978c1f9f08f87d0f9c94b
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Fri May 10 01:40:23 2013 +0300
Check that 3DNow! instructions are supported before including mm3dnow.h.
Include mm3dnow.h the way we already include the (S)SSE{3,4} and AVX
instruction headers: by checking that the compiler is set to support those
instructions besides verifying that QT_HAVE_3DNOW evalues to true (which
only means the compiler supported them when the build was being configured).
This has not caused a problem in most cases so far because GCC protects its
mm3dnow.h header with an #ifdef __3dNOW__ (contrary to what it does on, say,
pmmintrin.h). clang's mm3dnow.h, on the other hand, does not have that check
and can fail if -march is set to, for example, i386 or i486.
Not backported from qt5 because qtbase because qsimd_p.h does not include
the 3DNow! headers after commit a1b30b49ef09bef2e97b9a0622bf7ad622678fee.
Change-Id: I15ab5e936c71c55f89c3f25777ab27fbd262e9cd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
index 87e26e1..6a32e8f 100644
--- ./src/corelib/tools/qsimd_p.h
+++ ./src/corelib/tools/qsimd_p.h
@@ -199,7 +199,7 @@ QT_BEGIN_HEADER
#endif
// 3D now intrinsics
-#if defined(QT_HAVE_3DNOW)
+#if defined(QT_HAVE_3DNOW) && (defined(__3dNOW__) || defined(Q_CC_MSVC))
#include <mm3dnow.h>
#endif

3
x11/qt4-graphicssystems-opengl/Makefile
View file

@ -36,9 +36,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/opengl BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/opengl
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

35
x11/qt4-graphicssystems-opengl/files/patch-git_ccd1b2ee
View file

@ -1,35 +0,0 @@
commit ccd1b2ee01c193cd157978c1f9f08f87d0f9c94b
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Fri May 10 01:40:23 2013 +0300
Check that 3DNow! instructions are supported before including mm3dnow.h.
Include mm3dnow.h the way we already include the (S)SSE{3,4} and AVX
instruction headers: by checking that the compiler is set to support those
instructions besides verifying that QT_HAVE_3DNOW evalues to true (which
only means the compiler supported them when the build was being configured).
This has not caused a problem in most cases so far because GCC protects its
mm3dnow.h header with an #ifdef __3dNOW__ (contrary to what it does on, say,
pmmintrin.h). clang's mm3dnow.h, on the other hand, does not have that check
and can fail if -march is set to, for example, i386 or i486.
Not backported from qt5 because qtbase because qsimd_p.h does not include
the 3DNow! headers after commit a1b30b49ef09bef2e97b9a0622bf7ad622678fee.
Change-Id: I15ab5e936c71c55f89c3f25777ab27fbd262e9cd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
index 87e26e1..6a32e8f 100644
--- ./src/corelib/tools/qsimd_p.h
+++ ./src/corelib/tools/qsimd_p.h
@@ -199,7 +199,7 @@ QT_BEGIN_HEADER
#endif
// 3D now intrinsics
-#if defined(QT_HAVE_3DNOW)
+#if defined(QT_HAVE_3DNOW) && (defined(__3dNOW__) || defined(Q_CC_MSVC))
#include <mm3dnow.h>
#endif

3
x11/qt4-inputmethods/Makefile
View file

@ -35,9 +35,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

3
x11/qt4-opengl/Makefile
View file

@ -41,9 +41,8 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC}
CONFIGURE_ARGS+= -I../../include/QtCore -I../../include/QtGui \ CONFIGURE_ARGS+= -I../../include/QtCore -I../../include/QtGui \
-I../../include/Qt -I../../include -I../../include/Qt -I../../include
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
NO_STAGE= yes
pre-configure: pre-configure:
${MKDIR} ${WRKSRC}/mkspecs ${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake

35
x11/qt4-opengl/files/patch-git_ccd1b2ee
View file

@ -1,35 +0,0 @@
commit ccd1b2ee01c193cd157978c1f9f08f87d0f9c94b
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Fri May 10 01:40:23 2013 +0300
Check that 3DNow! instructions are supported before including mm3dnow.h.
Include mm3dnow.h the way we already include the (S)SSE{3,4} and AVX
instruction headers: by checking that the compiler is set to support those
instructions besides verifying that QT_HAVE_3DNOW evalues to true (which
only means the compiler supported them when the build was being configured).
This has not caused a problem in most cases so far because GCC protects its
mm3dnow.h header with an #ifdef __3dNOW__ (contrary to what it does on, say,
pmmintrin.h). clang's mm3dnow.h, on the other hand, does not have that check
and can fail if -march is set to, for example, i386 or i486.
Not backported from qt5 because qtbase because qsimd_p.h does not include
the 3DNow! headers after commit a1b30b49ef09bef2e97b9a0622bf7ad622678fee.
Change-Id: I15ab5e936c71c55f89c3f25777ab27fbd262e9cd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
index 87e26e1..6a32e8f 100644
--- ./src/corelib/tools/qsimd_p.h
+++ ./src/corelib/tools/qsimd_p.h
@@ -199,7 +199,7 @@ QT_BEGIN_HEADER
#endif
// 3D now intrinsics
-#if defined(QT_HAVE_3DNOW)
+#if defined(QT_HAVE_3DNOW) && (defined(__3dNOW__) || defined(Q_CC_MSVC))
#include <mm3dnow.h>
#endif