aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Nottebrock <lofi@FreeBSD.org>2007-08-02 22:37:40 +0000
committerMichael Nottebrock <lofi@FreeBSD.org>2007-08-02 22:37:40 +0000
commite332496be5f6fa4fa10c72920241b6910a69ca00 (patch)
tree7c1e4ee6690abd492b16853205c1bf65c308e4fb
parenta89bbaf869b99b813eb1a147e18884857d7e5495 (diff)
downloadports-e332496be5f6fa4fa10c72920241b6910a69ca00.tar.gz
ports-e332496be5f6fa4fa10c72920241b6910a69ca00.zip
Notes
-rw-r--r--Mk/bsd.qt.mk112
-rw-r--r--accessibility/qt4-accessible/Makefile9
-rw-r--r--accessibility/qt4-accessible/pkg-plist4
-rw-r--r--chinese/qt4-codecs-cn/Makefile6
-rw-r--r--chinese/qt4-codecs-cn/pkg-plist2
-rw-r--r--chinese/qt4-codecs-tw/Makefile6
-rw-r--r--chinese/qt4-codecs-tw/pkg-plist2
-rw-r--r--databases/qt4-ibase-plugin/Makefile2
-rw-r--r--databases/qt4-mysql-plugin/Makefile2
-rw-r--r--databases/qt4-odbc-plugin/Makefile2
-rw-r--r--databases/qt4-pgsql-plugin/Makefile2
-rw-r--r--databases/qt4-sql/Makefile15
-rw-r--r--databases/qt4-sql/pkg-plist1
-rw-r--r--databases/qt4-sqlite-plugin/Makefile2
-rw-r--r--databases/qt4-sqlite3-plugin/Makefile2
-rw-r--r--devel/dbus-qt4/Makefile6
-rw-r--r--devel/dbus-qt4/pkg-plist8
-rw-r--r--devel/qt4-assistant/Makefile3
-rw-r--r--devel/qt4-assistant/pkg-plist2
-rw-r--r--devel/qt4-corelib/Makefile10
-rw-r--r--devel/qt4-corelib/files/patch-src_corelib_arch_arm_arch.pri9
-rw-r--r--devel/qt4-corelib/pkg-plist1
-rw-r--r--devel/qt4-designer/Makefile4
-rw-r--r--devel/qt4-designer/pkg-plist8
-rw-r--r--devel/qt4-libqtassistantclient/Makefile4
-rw-r--r--devel/qt4-libqtassistantclient/pkg-plist1
-rw-r--r--devel/qt4-linguist/Makefile3
-rw-r--r--devel/qt4-linguist/pkg-plist6
-rw-r--r--devel/qt4-makeqpf/Makefile2
-rw-r--r--devel/qt4-makeqpf/pkg-plist2
-rw-r--r--devel/qt4-moc/Makefile2
-rw-r--r--devel/qt4-moc/pkg-plist2
-rw-r--r--devel/qt4-porting/Makefile2
-rw-r--r--devel/qt4-porting/pkg-plist2
-rw-r--r--devel/qt4-qdbusviewer/Makefile2
-rw-r--r--devel/qt4-qdbusviewer/pkg-plist2
-rw-r--r--devel/qt4-qt3support/Makefile6
-rw-r--r--devel/qt4-qt3support/pkg-plist2
-rw-r--r--devel/qt4-qtestlib/Makefile8
-rw-r--r--devel/qt4-qtestlib/pkg-plist1
-rw-r--r--devel/qt4-qvfb/Makefile2
-rw-r--r--devel/qt4-qvfb/pkg-plist2
-rw-r--r--devel/qt4-rcc/Makefile2
-rw-r--r--devel/qt4-rcc/pkg-plist2
-rw-r--r--devel/qt4-script/Makefile8
-rw-r--r--devel/qt4-script/pkg-plist1
-rw-r--r--devel/qt4-uic/Makefile2
-rw-r--r--devel/qt4-uic/pkg-plist2
-rw-r--r--devel/qt4-uic3/Makefile2
-rw-r--r--devel/qt4-uic3/pkg-plist2
-rw-r--r--graphics/qt4-iconengines/Makefile6
-rw-r--r--graphics/qt4-iconengines/pkg-plist2
-rw-r--r--graphics/qt4-imageformats/Makefile6
-rw-r--r--graphics/qt4-imageformats/pkg-plist10
-rw-r--r--graphics/qt4-pixeltool/Makefile3
-rw-r--r--graphics/qt4-pixeltool/pkg-plist2
-rw-r--r--graphics/qt4-svg/Makefile15
-rw-r--r--graphics/qt4-svg/pkg-plist1
-rw-r--r--japanese/qt4-codecs-jp/Makefile9
-rw-r--r--japanese/qt4-codecs-jp/pkg-plist2
-rw-r--r--korean/qt4-codecs-kr/Makefile8
-rw-r--r--korean/qt4-codecs-kr/pkg-plist2
-rw-r--r--misc/qt4-doc/Makefile1
-rw-r--r--misc/qt4-qtconfig/Makefile2
-rw-r--r--misc/qt4-qtconfig/pkg-plist2
-rw-r--r--misc/qt4-qtdemo/Makefile5
-rw-r--r--misc/qt4-qtdemo/pkg-plist356
-rw-r--r--net/qt4-network/Makefile6
-rw-r--r--net/qt4-network/pkg-plist2
-rw-r--r--textproc/qt4-xml/Makefile8
-rw-r--r--textproc/qt4-xml/pkg-plist1
-rw-r--r--x11-toolkits/qt4-gui/Makefile4
-rw-r--r--x11-toolkits/qt4-gui/pkg-plist1
-rw-r--r--x11/qt4-inputmethods/Makefile6
-rw-r--r--x11/qt4-inputmethods/pkg-plist2
-rw-r--r--x11/qt4-opengl/Makefile6
-rw-r--r--x11/qt4-opengl/pkg-plist2
77 files changed, 408 insertions, 354 deletions
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk
index 6e819a515386..bd216d8df552 100644
--- a/Mk/bsd.qt.mk
+++ b/Mk/bsd.qt.mk
@@ -34,7 +34,14 @@ CONFIGURE_ARGS+=-fast -no-exceptions ${CUPS} \
CONFIGURE_ARGS+=-no-3dnow -no-sse -no-sse2
.endif #defined(PACKAGE_BUILDING)
-.if defined(QT_WANT_VERBOSE_CONFIGURE)
+.if !defined(WANT_QT_DEBUG)
+CONFIGURE_ARGS+=-no-separate-debug-info
+PLIST_SUB+= DEBUG="@comment "
+.else
+PLIST_SUB+= DEBUG=""
+.endif
+
+.if defined(WANT_QT_VERBOSE_CONFIGURE)
CONFIGURE_ARGS+=-v
.endif
.endif #defined(QT_DIST)
@@ -101,24 +108,111 @@ uic_DEPENDS= devel/qt4-uic
uic3_DEPENDS= devel/qt4-uic3
xml_DEPENDS= textproc/qt4-xml
+accessible_build_DEPENDS= ${accessible_DEPENDS}
+assistant_build_DEPENDS= ${assistant_DEPENDS}
+assistantclient_build_DEPENDS= ${assistantclient_DEPENDS}
+assistantclient_build_NAME= ${assistantclient_NAME}
+codecs-cn_build_DEPENDS= ${codecs-cn_DEPENDS}
+codecs-jp_build_DEPENDS= ${codecs-jp_DEPENDS}
+codecs-kr_build_DEPENDS= ${codecs-kr_DEPENDS}
+codecs-tw_build_DEPENDS= ${codecs-tw_DEPENDS}
+corelib_build_DEPENDS= ${corelib_DEPENDS}
+dbus_build_DEPENDS= ${dbus_DEPENDS}
+designer_build_DEPENDS= ${designer_DEPENDS}
+doc_build_DEPENDS= ${doc_DEPENDS}
+gui_build_DEPENDS= ${gui_DEPENDS}
+iconengines_build_DEPENDS= ${iconengines_DEPENDS}
+imageformats_build_DEPENDS= ${imageformats_DEPENDS}
+inputmethods_build_DEPENDS= ${inputmethods_DEPENDS}
+linguist_build_DEPENDS= ${linguist_DEPENDS}
+makeqpf_build_DEPENDS= ${makeqpf_DEPENDS}
+moc_build_DEPENDS= ${moc_DEPENDS}
+network_build_DEPENDS= ${network_DEPENDS}
+opengl_build_DEPENDS= ${opengl_DEPENDS}
+pixeltool_build_DEPENDS= ${pixeltool_DEPENDS}
+porting_build_DEPENDS= ${porting_DEPENDS}
+qdbusviewer_build_DEPENDS= ${qdbusviewer_DEPENDS}
+qmake_build_DEPENDS= ${qmake_DEPENDS}
+qmake_build_QT4_PREFIX= ${qmake_QT4_PREFIX}
+qt3support_build_DEPENDS= ${qt3support_DEPENDS}
+qtconfig_build_DEPENDS= ${qtconfig_DEPENDS}
+qtestlib_build_DEPENDS= ${qtestlib_DEPENDS}
+qvfb_build_DEPENDS= ${qvfb_DEPENDS}
+rcc_build_DEPENDS= ${rcc_DEPENDS}
+script_build_DEPENDS= ${script_DEPENDS}
+sql_build_DEPENDS= ${sql_DEPENDS}
+svg_build_DEPENDS= ${svg_DEPENDS}
+uic_build_DEPENDS= ${uic_DEPENDS}
+uic3_build_DEPENDS= ${uic3_DEPENDS}
+xml_build_DEPENDS= ${xml_DEPENDS}
+
+accessible_run_DEPENDS= ${accessible_DEPENDS}
+assistant_run_DEPENDS= ${assistant_DEPENDS}
+assistantclient_run_DEPENDS= ${assistantclient_DEPENDS}
+assistantclient_run_NAME= ${assistantclient_NAME}
+codecs-cn_run_DEPENDS= ${codecs-cn_DEPENDS}
+codecs-jp_run_DEPENDS= ${codecs-jp_DEPENDS}
+codecs-kr_run_DEPENDS= ${codecs-kr_DEPENDS}
+codecs-tw_run_DEPENDS= ${codecs-tw_DEPENDS}
+corelib_run_DEPENDS= ${corelib_DEPENDS}
+dbus_run_DEPENDS= ${dbus_DEPENDS}
+designer_run_DEPENDS= ${designer_DEPENDS}
+doc_run_DEPENDS= ${doc_DEPENDS}
+gui_run_DEPENDS= ${gui_DEPENDS}
+iconengines_run_DEPENDS= ${iconengines_DEPENDS}
+imageformats_run_DEPENDS= ${imageformats_DEPENDS}
+inputmethods_run_DEPENDS= ${inputmethods_DEPENDS}
+linguist_run_DEPENDS= ${linguist_DEPENDS}
+makeqpf_run_DEPENDS= ${makeqpf_DEPENDS}
+moc_run_DEPENDS= ${moc_DEPENDS}
+network_run_DEPENDS= ${network_DEPENDS}
+opengl_run_DEPENDS= ${opengl_DEPENDS}
+pixeltool_run_DEPENDS= ${pixeltool_DEPENDS}
+porting_run_DEPENDS= ${porting_DEPENDS}
+qdbusviewer_run_DEPENDS= ${qdbusviewer_DEPENDS}
+qmake_run_DEPENDS= ${qmake_DEPENDS}
+qmake_run_QT4_PREFIX= ${qmake_QT4_PREFIX}
+qt3support_run_DEPENDS= ${qt3support_DEPENDS}
+qtconfig_run_DEPENDS= ${qtconfig_DEPENDS}
+qtestlib_run_DEPENDS= ${qtestlib_DEPENDS}
+qvfb_run_DEPENDS= ${qvfb_DEPENDS}
+rcc_run_DEPENDS= ${rcc_DEPENDS}
+script_run_DEPENDS= ${script_DEPENDS}
+sql_run_DEPENDS= ${sql_DEPENDS}
+svg_run_DEPENDS= ${svg_DEPENDS}
+uic_run_DEPENDS= ${uic_DEPENDS}
+uic3_run_DEPENDS= ${uic3_DEPENDS}
+xml_run_DEPENDS= ${xml_DEPENDS}
+
.if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include)
Qt_Post_Include= bsd.qt.mk
+.for component in ${_QT_COMPONENTS_ALL}
+_QT_COMPONENTS_SUFFIXED+=${component} ${component}_build ${component}_run
+.endfor
+
.if defined(QT_COMPONENTS)
.for ext in ${QT_COMPONENTS}
-${ext}_QT4_PREFIX?= qt4-
-${ext}_QT4_VERSION?= ${QT4_VERSION}
-${ext}_NAME?= ${ext}
-.if ${_QT_COMPONENTS_ALL:M${ext}}!= ""
-BUILD_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
-RUN_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
+${ext}_QT4_PREFIX?= qt4-
+${ext}_QT4_VERSION?= ${QT4_VERSION}
+${ext}_NAME?= ${ext}
+_${ext}= ${ext}
+.if ${_QT_COMPONENTS_SUFFIXED:M${ext}}!= ""
+.if ${_${ext}:M*_build}!= ""
+BUILD_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME:S/_build//}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
+.elif ${_${ext}:M*_run}!= ""
+RUN_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME:S/_run//}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
+.else
+BUILD_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
+RUN_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
+.endif
.else
IGNORE= cannot install: unknown Qt4 component -- ${ext}
.endif
.endfor
.else
-BUILD_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
-RUN_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
+BUILD_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
+RUN_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
.endif
.endif
diff --git a/accessibility/qt4-accessible/Makefile b/accessibility/qt4-accessible/Makefile
index 33fe86a435f4..2e812511a2cb 100644
--- a/accessibility/qt4-accessible/Makefile
+++ b/accessibility/qt4-accessible/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt accessibility widgets
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc qt3support corelib gui network sql xml
+QT_COMPONENTS= qmake_build moc_build qt3support corelib gui network sql xml
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -42,8 +42,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
WRKSRC= ${WRKDIR}/${DISTNAME}/src/plugins/${PORTNAME}
CONFIGURE_WRKSRC=${WRKSRC}/../../..
-.include <bsd.port.pre.mk>
-
pre-configure:
${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib/plugins/accessible|g' \
@@ -52,7 +50,4 @@ pre-configure:
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../bin/qmake
${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../../bin/moc
-post-configure:
- ${REINPLACE_CMD} -e 's|(test -z.*||g' ${WRKSRC}/Makefile
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/accessibility/qt4-accessible/pkg-plist b/accessibility/qt4-accessible/pkg-plist
index 36f86b8b0a6e..5115727c69d3 100644
--- a/accessibility/qt4-accessible/pkg-plist
+++ b/accessibility/qt4-accessible/pkg-plist
@@ -1,5 +1,5 @@
lib/plugins/accessible/libqtaccessiblecompatwidgets.so
-lib/plugins/accessible/libqtaccessiblecompatwidgets.so.debug
+%%DEBUG%%lib/plugins/accessible/libqtaccessiblecompatwidgets.so.debug
lib/plugins/accessible/libqtaccessiblewidgets.so
-lib/plugins/accessible/libqtaccessiblewidgets.so.debug
+%%DEBUG%%lib/plugins/accessible/libqtaccessiblewidgets.so.debug
@dirrm lib/plugins/accessible
diff --git a/chinese/qt4-codecs-cn/Makefile b/chinese/qt4-codecs-cn/Makefile
index ed065ad49db9..81457b0803a3 100644
--- a/chinese/qt4-codecs-cn/Makefile
+++ b/chinese/qt4-codecs-cn/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt GB 18030 codec plugin
USE_QT_VER= 4
-QT_COMPONENTS= qmake corelib
+QT_COMPONENTS= qmake_build corelib
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -43,8 +43,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
WRKSRC= ${WRKDIR}/${DISTNAME}/src/plugins/${PORTNAME}/cn
CONFIGURE_WRKSRC=${WRKSRC}/../../../..
-.include <bsd.port.pre.mk>
-
pre-configure:
${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib/plugins/codecs|g' \
@@ -56,4 +54,4 @@ pre-configure:
post-configure:
${REINPLACE_CMD} -e 's|(test -z.*||g' ${WRKSRC}/Makefile
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/qt4-codecs-cn/pkg-plist b/chinese/qt4-codecs-cn/pkg-plist
index 9c3a72187d21..c1469343d723 100644
--- a/chinese/qt4-codecs-cn/pkg-plist
+++ b/chinese/qt4-codecs-cn/pkg-plist
@@ -1,3 +1,3 @@
lib/plugins/codecs/libqcncodecs.so
-lib/plugins/codecs/libqcncodecs.so.debug
+%%DEBUG%%lib/plugins/codecs/libqcncodecs.so.debug
@dirrm lib/plugins/codecs
diff --git a/chinese/qt4-codecs-tw/Makefile b/chinese/qt4-codecs-tw/Makefile
index 270444b5e42e..2e8cb17f26e0 100644
--- a/chinese/qt4-codecs-tw/Makefile
+++ b/chinese/qt4-codecs-tw/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt Big-5 codec plugin
USE_QT_VER= 4
-QT_COMPONENTS= qmake corelib
+QT_COMPONENTS= qmake_build corelib
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -43,8 +43,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
WRKSRC= ${WRKDIR}/${DISTNAME}/src/plugins/${PORTNAME}/tw
CONFIGURE_WRKSRC=${WRKSRC}/../../../..
-.include <bsd.port.pre.mk>
-
pre-configure:
${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib/plugins/codecs|g' \
@@ -53,4 +51,4 @@ pre-configure:
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../../bin/qmake
${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../../../bin/moc
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/qt4-codecs-tw/pkg-plist b/chinese/qt4-codecs-tw/pkg-plist
index 86cff7bf6e0a..ee41cd9ed325 100644
--- a/chinese/qt4-codecs-tw/pkg-plist
+++ b/chinese/qt4-codecs-tw/pkg-plist
@@ -1,3 +1,3 @@
lib/plugins/codecs/libqtwcodecs.so
-lib/plugins/codecs/libqtwcodecs.so.debug
+%%DEBUG%%lib/plugins/codecs/libqtwcodecs.so.debug
@dirrm lib/plugins/codecs
diff --git a/databases/qt4-ibase-plugin/Makefile b/databases/qt4-ibase-plugin/Makefile
index f6bd4a7f64cc..911cbc9df26f 100644
--- a/databases/qt4-ibase-plugin/Makefile
+++ b/databases/qt4-ibase-plugin/Makefile
@@ -20,7 +20,7 @@ DB= ibase
USE_FIREBIRD= yes
USE_QT_VER= 4
-QT_COMPONENTS= moc sql
+QT_COMPONENTS= moc_build sql
QT_NONSTANDARD= yes
#USE_BZIP2= yes
diff --git a/databases/qt4-mysql-plugin/Makefile b/databases/qt4-mysql-plugin/Makefile
index bf47e4f102ba..7f503ca202db 100644
--- a/databases/qt4-mysql-plugin/Makefile
+++ b/databases/qt4-mysql-plugin/Makefile
@@ -19,7 +19,7 @@ COMMENT= Qt MySQL database plugin
DB= mysql
USE_QT_VER= 4
-QT_COMPONENTS= moc sql
+QT_COMPONENTS= moc_build sql
QT_NONSTANDARD= yes
USE_MYSQL= yes
diff --git a/databases/qt4-odbc-plugin/Makefile b/databases/qt4-odbc-plugin/Makefile
index 477a9ced62d7..b802deb94f46 100644
--- a/databases/qt4-odbc-plugin/Makefile
+++ b/databases/qt4-odbc-plugin/Makefile
@@ -21,7 +21,7 @@ DB= odbc
LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC
USE_QT_VER= 4
-QT_COMPONENTS= moc sql
+QT_COMPONENTS= moc_build sql
QT_NONSTANDARD= yes
#USE_BZIP2= yes
diff --git a/databases/qt4-pgsql-plugin/Makefile b/databases/qt4-pgsql-plugin/Makefile
index da73df1ec065..b076f0e88ba5 100644
--- a/databases/qt4-pgsql-plugin/Makefile
+++ b/databases/qt4-pgsql-plugin/Makefile
@@ -19,7 +19,7 @@ COMMENT= Qt PostgreSQL database plugin
DB= psql
USE_QT_VER= 4
-QT_COMPONENTS= moc sql
+QT_COMPONENTS= moc_build sql
QT_NONSTANDARD= yes
USE_PGSQL= yes
diff --git a/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile
index e410c73b442a..bc98f436c464 100644
--- a/databases/qt4-sql/Makefile
+++ b/databases/qt4-sql/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SQL library
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc corelib
+QT_COMPONENTS= qmake_build moc_build corelib
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -45,15 +45,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME}
CONFIGURE_WRKSRC=${WRKSRC}/../../
-.include <bsd.port.pre.mk>
-
-.if defined(PKGNAMESUFFIX) && (${PKGNAMESUFFIX} == "-debug" || ${PKGNAMESUFFIX} == "-static-debug")
-CONFIGURE_ARGS+=-debug
-.endif
-.if defined(PKGNAMESUFFIX) && (${PKGNAMESUFFIX} == "-static" || ${PKGNAMESUFFIX} == "-static-debug")
-CONFIGURE_ARGS+=-static
-.endif
-
pre-configure:
${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \
@@ -65,10 +56,10 @@ pre-configure:
${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc
post-configure:
${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
- -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${WRKSRC}/Makefile
+ -e 's|.*$$(QMAKE).*||g' ${WRKSRC}/Makefile
${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
${WRKSRC}/../../lib/pkgconfig/*Qt*
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/qt4-sql/pkg-plist b/databases/qt4-sql/pkg-plist
index 14c2bdc1da3c..8c219e9760dc 100644
--- a/databases/qt4-sql/pkg-plist
+++ b/databases/qt4-sql/pkg-plist
@@ -75,5 +75,6 @@ lib/libQtSql.so
lib/libQtSql.so.4
lib/libQtSql.so.4.3
lib/libQtSql.so.4.3.0
+%%DEBUG%%lib/libQtSql.so.4.3.0.debug
libdata/pkgconfig/QtSql.pc
@dirrm include/QtSql
diff --git a/databases/qt4-sqlite-plugin/Makefile b/databases/qt4-sqlite-plugin/Makefile
index 30f74fbb76ba..b01286f87c75 100644
--- a/databases/qt4-sqlite-plugin/Makefile
+++ b/databases/qt4-sqlite-plugin/Makefile
@@ -21,7 +21,7 @@ DB= sqlite2
LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2
USE_QT_VER= 4
-QT_COMPONENTS= moc sql
+QT_COMPONENTS= moc_build sql
QT_NONSTANDARD= yes
#USE_BZIP2= yes
diff --git a/databases/qt4-sqlite3-plugin/Makefile b/databases/qt4-sqlite3-plugin/Makefile
index 7ead82825396..ee53635c6e77 100644
--- a/databases/qt4-sqlite3-plugin/Makefile
+++ b/databases/qt4-sqlite3-plugin/Makefile
@@ -21,7 +21,7 @@ DB= sqlite
LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3
USE_QT_VER= 4
-QT_COMPONENTS= moc sql
+QT_COMPONENTS= moc_build sql
QT_NONSTANDARD= yes
#USE_BZIP2= yes
diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile
index 52768b9b135e..a8efef71ebb1 100644
--- a/devel/dbus-qt4/Makefile
+++ b/devel/dbus-qt4/Makefile
@@ -21,7 +21,7 @@ COMMENT= Qt4 bindings for the D-BUS messaging system
LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc rcc corelib gui xml
+QT_COMPONENTS= qmake_build moc_build rcc_build corelib gui xml
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -43,8 +43,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
WRKSRC= ${WRKDIR}/${DISTNAME}/tools/qdbus
CONFIGURE_WRKSRC=${WRKSRC}/../../
-.include <bsd.port.pre.mk>
-
pre-configure:
${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|qdbusviewer||g' ${WRKSRC}/tools/tools.pro
@@ -68,4 +66,4 @@ post-configure:
-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
${WRKSRC}/../../lib/pkgconfig/*Qt*
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/dbus-qt4/pkg-plist b/devel/dbus-qt4/pkg-plist
index 9575b6c51744..0efee4443d78 100644
--- a/devel/dbus-qt4/pkg-plist
+++ b/devel/dbus-qt4/pkg-plist
@@ -1,9 +1,9 @@
bin/qdbus
-bin/qdbus.debug
+%%DEBUG%%bin/qdbus.debug
bin/qdbuscpp2xml
-bin/qdbuscpp2xml.debug
+%%DEBUG%%bin/qdbuscpp2xml.debug
bin/qdbusxml2cpp
-bin/qdbusxml2cpp.debug
+%%DEBUG%%bin/qdbusxml2cpp.debug
include/QtDBus/QDBusAbstractAdaptor
include/QtDBus/QDBusAbstractInterface
include/QtDBus/QDBusArgument
@@ -40,6 +40,6 @@ lib/libQtDBus.so
lib/libQtDBus.so.4
lib/libQtDBus.so.4.3
lib/libQtDBus.so.4.3.0
-lib/libQtDBus.so.4.3.0.debug
+%%DEBUG%%lib/libQtDBus.so.4.3.0.debug
libdata/pkgconfig/QtDBus.pc
@dirrm include/QtDBus
diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile
index 023e78e550fe..949164b2cbe0 100644
--- a/devel/qt4-assistant/Makefile
+++ b/devel/qt4-assistant/Makefile
@@ -19,7 +19,8 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt documentation browser
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc rcc uic qt3support corelib gui network sql xml doc
+QT_COMPONENTS= qmake_build moc_build rcc_build uic_build qt3support corelib \
+ gui network sql xml doc
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/devel/qt4-assistant/pkg-plist b/devel/qt4-assistant/pkg-plist
index 5d85d93372aa..fb8d73d1d7e1 100644
--- a/devel/qt4-assistant/pkg-plist
+++ b/devel/qt4-assistant/pkg-plist
@@ -1,2 +1,2 @@
bin/assistant-qt4
-bin/assistant-qt4.debug
+%%DEBUG%%bin/assistant-qt4.debug
diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile
index 657e94bd2541..600ffd7198f2 100644
--- a/devel/qt4-corelib/Makefile
+++ b/devel/qt4-corelib/Makefile
@@ -21,7 +21,7 @@ COMMENT= Qt core library
LIB_DEPENDS= glib-2.0:${PORTSDIR}/devel/glib20
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc
+QT_COMPONENTS= qmake_build moc_build
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -47,8 +47,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME}
CONFIGURE_WRKSRC=${WRKSRC}/../../
PATCH_WRKSRC=${CONFIGURE_WRKSRC}
-.include <bsd.port.pre.mk>
-
pre-configure:
${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \
@@ -60,16 +58,14 @@ pre-configure:
${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc
post-configure:
${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
- -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${WRKSRC}/Makefile
+ -e 's|.*$$(QMAKE).*||g' ${WRKSRC}/Makefile
${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
${WRKSRC}/../../lib/pkgconfig/*Qt*
-.if !defined(PKGNAMESUFFIX)
post-install:
${MKDIR} ${PREFIX}/lib/plugins
${TOUCH} ${PREFIX}/lib/plugins/.keep_me
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/qt4-corelib/files/patch-src_corelib_arch_arm_arch.pri b/devel/qt4-corelib/files/patch-src_corelib_arch_arm_arch.pri
new file mode 100644
index 000000000000..0cc60cd18225
--- /dev/null
+++ b/devel/qt4-corelib/files/patch-src_corelib_arch_arm_arch.pri
@@ -0,0 +1,9 @@
+--- src/corelib/arch/arm/arch.pri.orig 2007-05-25 15:24:41.000000000 +0200
++++ src/corelib/arch/arm/arch.pri 2007-07-25 20:23:32.000000000 +0200
+@@ -1,5 +1,4 @@
+ #
+ # ARM architecture
+ #
+-SOURCES += $$QT_ARCH_CPP/qatomic.cpp \
+- $$QT_ARCH_CPP/malloc.c
++SOURCES += $$QT_ARCH_CPP/qatomic.cpp
diff --git a/devel/qt4-corelib/pkg-plist b/devel/qt4-corelib/pkg-plist
index d3d9433865ce..00c303d47d93 100644
--- a/devel/qt4-corelib/pkg-plist
+++ b/devel/qt4-corelib/pkg-plist
@@ -419,6 +419,7 @@ lib/libQtCore.so
lib/libQtCore.so.4
lib/libQtCore.so.4.3
lib/libQtCore.so.4.3.0
+%%DEBUG%%lib/libQtCore.so.4.3.0.debug
lib/plugins/.keep_me
libdata/pkgconfig/QtCore.pc
@dirrmtry share/qt4
diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile
index f1db40c8dad3..bfa83eefeb33 100644
--- a/devel/qt4-designer/Makefile
+++ b/devel/qt4-designer/Makefile
@@ -19,8 +19,8 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt ui editor
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc rcc uic assistantclient qt3support corelib gui network\
- script sql xml
+QT_COMPONENTS= qmake_build moc_build rcc_build uic_build assistantclient \
+ qt3support corelib gui network script sql xml
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/devel/qt4-designer/pkg-plist b/devel/qt4-designer/pkg-plist
index 5441f3ec4714..42629782fa43 100644
--- a/devel/qt4-designer/pkg-plist
+++ b/devel/qt4-designer/pkg-plist
@@ -1,5 +1,5 @@
bin/designer-qt4
-bin/designer-qt4.debug
+%%DEBUG%%bin/designer-qt4.debug
include/QtDesigner/QAbstractExtensionFactory
include/QtDesigner/QAbstractExtensionManager
include/QtDesigner/QAbstractFormBuilder
@@ -87,17 +87,17 @@ lib/libQtDesigner.so
lib/libQtDesigner.so.4
lib/libQtDesigner.so.4.3
lib/libQtDesigner.so.4.3.0
-lib/libQtDesigner.so.4.3.0.debug
+%%DEBUG%%lib/libQtDesigner.so.4.3.0.debug
lib/libQtDesignerComponents.prl
lib/libQtDesignerComponents.so
lib/libQtDesignerComponents.so.4
lib/libQtDesignerComponents.so.4.3
lib/libQtDesignerComponents.so.4.3.0
-lib/libQtDesignerComponents.so.4.3.0.debug
+%%DEBUG%%lib/libQtDesignerComponents.so.4.3.0.debug
lib/libQtUiTools.a
lib/libQtUiTools.prl
lib/plugins/libqt3supportwidgets.so
-lib/plugins/libqt3supportwidgets.so.debug
+%%DEBUG%%lib/plugins/libqt3supportwidgets.so.debug
libdata/pkgconfig/QtUiTools.pc
@dirrm include/QtUiTools
@dirrm include/QtDesigner
diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile
index 255dfd469c26..947985cb065b 100644
--- a/devel/qt4-libqtassistantclient/Makefile
+++ b/devel/qt4-libqtassistantclient/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt documentation browser integration library
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc corelib gui network
+QT_COMPONENTS= qmake_build moc_build corelib gui network
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -56,7 +56,7 @@ pre-configure:
post-configure:
${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
- -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${WRKSRC}/Makefile
+ -e 's|.*$$(QMAKE).*||g' ${WRKSRC}/Makefile
${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
diff --git a/devel/qt4-libqtassistantclient/pkg-plist b/devel/qt4-libqtassistantclient/pkg-plist
index 32f134063776..a371174cd079 100644
--- a/devel/qt4-libqtassistantclient/pkg-plist
+++ b/devel/qt4-libqtassistantclient/pkg-plist
@@ -7,5 +7,6 @@ lib/libQtAssistantClient.so
lib/libQtAssistantClient.so.4
lib/libQtAssistantClient.so.4.3
lib/libQtAssistantClient.so.4.3.0
+%%DEBUG%%lib/libQtAssistantClient.so.4.3.0.debug
libdata/pkgconfig/QtAssistantClient.pc
@dirrm include/QtAssistant
diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile
index f26d6431053b..0ae577b10cef 100644
--- a/devel/qt4-linguist/Makefile
+++ b/devel/qt4-linguist/Makefile
@@ -19,7 +19,8 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt localisation tool
USE_QT_VER= 4
-QT_COMPONENTS= qmake designer moc rcc uic assistantclient gui network xml
+QT_COMPONENTS= qmake_build designer moc_build rcc_build uic_build \
+ assistantclient gui network xml
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/devel/qt4-linguist/pkg-plist b/devel/qt4-linguist/pkg-plist
index e629ea1c49be..6c2d4046abce 100644
--- a/devel/qt4-linguist/pkg-plist
+++ b/devel/qt4-linguist/pkg-plist
@@ -1,9 +1,9 @@
bin/linguist-qt4
-bin/linguist-qt4.debug
+%%DEBUG%%bin/linguist-qt4.debug
bin/lrelease-qt4
-bin/lrelease-qt4.debug
+%%DEBUG%%bin/lrelease-qt4.debug
bin/lupdate-qt4
-bin/lupdate-qt4.debug
+%%DEBUG%%bin/lupdate-qt4.debug
share/qt4/phrasebooks/danish.qph
share/qt4/phrasebooks/dutch.qph
share/qt4/phrasebooks/finnish.qph
diff --git a/devel/qt4-makeqpf/Makefile b/devel/qt4-makeqpf/Makefile
index 85274db8ef62..bb0e1d2f44cd 100644
--- a/devel/qt4-makeqpf/Makefile
+++ b/devel/qt4-makeqpf/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt qtopia font creator
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc rcc uic corelib gui
+QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib gui
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/devel/qt4-makeqpf/pkg-plist b/devel/qt4-makeqpf/pkg-plist
index e559beaa3c72..cc85d393c083 100644
--- a/devel/qt4-makeqpf/pkg-plist
+++ b/devel/qt4-makeqpf/pkg-plist
@@ -1,2 +1,2 @@
bin/makeqpf-qt4
-bin/makeqpf-qt4.debug
+%%DEBUG%%bin/makeqpf-qt4.debug
diff --git a/devel/qt4-moc/Makefile b/devel/qt4-moc/Makefile
index 95224e8c61bc..8801e17136ae 100644
--- a/devel/qt4-moc/Makefile
+++ b/devel/qt4-moc/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt meta object compiler
USE_QT_VER= 4
-QT_COMPONENTS= qmake
+QT_COMPONENTS= qmake_build
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/devel/qt4-moc/pkg-plist b/devel/qt4-moc/pkg-plist
index 9629ce043147..690446be106a 100644
--- a/devel/qt4-moc/pkg-plist
+++ b/devel/qt4-moc/pkg-plist
@@ -1,2 +1,2 @@
bin/moc-qt4
-bin/moc-qt4.debug
+%%DEBUG%%bin/moc-qt4.debug
diff --git a/devel/qt4-porting/Makefile b/devel/qt4-porting/Makefile
index bea665729817..4d20c3b91c2a 100644
--- a/devel/qt4-porting/Makefile
+++ b/devel/qt4-porting/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt utility to assist with porting Qt3 applications to Qt4
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc rcc uic corelib xml
+QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib xml
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/devel/qt4-porting/pkg-plist b/devel/qt4-porting/pkg-plist
index cf760c8d2a95..be89f2cc9eb9 100644
--- a/devel/qt4-porting/pkg-plist
+++ b/devel/qt4-porting/pkg-plist
@@ -1,3 +1,3 @@
bin/qt3to4
-bin/qt3to4.debug
+%%DEBUG%%bin/qt3to4.debug
share/qt4/q3porting.xml
diff --git a/devel/qt4-qdbusviewer/Makefile b/devel/qt4-qdbusviewer/Makefile
index b5e988b6e5b3..8ddd75e24b86 100644
--- a/devel/qt4-qdbusviewer/Makefile
+++ b/devel/qt4-qdbusviewer/Makefile
@@ -21,7 +21,7 @@ COMMENT= Qt4 D-BUS viewer
LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc rcc corelib dbus gui xml
+QT_COMPONENTS= qmake_build moc_build rcc_build corelib dbus gui xml
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/devel/qt4-qdbusviewer/pkg-plist b/devel/qt4-qdbusviewer/pkg-plist
index 1eb0a48e3608..5a6cf015d441 100644
--- a/devel/qt4-qdbusviewer/pkg-plist
+++ b/devel/qt4-qdbusviewer/pkg-plist
@@ -1,2 +1,2 @@
bin/qdbusviewer
-bin/qdbusviewer.debug
+%%DEBUG%%bin/qdbusviewer.debug
diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile
index 0c8dc2617a3b..a931e8221b1c 100644
--- a/devel/qt4-qt3support/Makefile
+++ b/devel/qt4-qt3support/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt3 compatibility library
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc corelib gui network sql xml
+QT_COMPONENTS= qmake_build moc_build corelib gui network sql xml
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -45,8 +45,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME}
CONFIGURE_WRKSRC=${WRKSRC}/../../
PATCH_WRKSRC=${CONFIGURE_WRKSRC}
-.include <bsd.port.pre.mk>
-
pre-configure:
${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \
@@ -64,4 +62,4 @@ post-configure:
-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
${WRKSRC}/../../lib/pkgconfig/*Qt*
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/qt4-qt3support/pkg-plist b/devel/qt4-qt3support/pkg-plist
index 002aca07c933..107f8ab1edca 100644
--- a/devel/qt4-qt3support/pkg-plist
+++ b/devel/qt4-qt3support/pkg-plist
@@ -407,6 +407,6 @@ lib/libQt3Support.so
lib/libQt3Support.so.4
lib/libQt3Support.so.4.3
lib/libQt3Support.so.4.3.0
-lib/libQt3Support.so.4.3.0.debug
+%%DEBUG%%lib/libQt3Support.so.4.3.0.debug
libdata/pkgconfig/Qt3Support.pc
@dirrm include/Qt3Support
diff --git a/devel/qt4-qtestlib/Makefile b/devel/qt4-qtestlib/Makefile
index ee5d65d6c9fe..b784f4c1443a 100644
--- a/devel/qt4-qtestlib/Makefile
+++ b/devel/qt4-qtestlib/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt unit testing library
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc corelib
+QT_COMPONENTS= qmake_build moc_build corelib
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -45,8 +45,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME}
CONFIGURE_WRKSRC=${WRKSRC}/../../
PATCH_WRKSRC=${CONFIGURE_WRKSRC}
-.include <bsd.port.pre.mk>
-
pre-configure:
${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \
@@ -57,10 +55,10 @@ pre-configure:
${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc
post-configure:
${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
- -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${WRKSRC}/src/Makefile
+ -e 's|.*$$(QMAKE).*||g' ${WRKSRC}/src/Makefile
${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
${WRKSRC}/../../lib/pkgconfig/*Qt*
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/qt4-qtestlib/pkg-plist b/devel/qt4-qtestlib/pkg-plist
index 373b663d75df..ce45c94cdeac 100644
--- a/devel/qt4-qtestlib/pkg-plist
+++ b/devel/qt4-qtestlib/pkg-plist
@@ -33,5 +33,6 @@ lib/libQtTest.so
lib/libQtTest.so.4
lib/libQtTest.so.4.3
lib/libQtTest.so.4.3.0
+%%DEBUG%%lib/libQtTest.so.4.3.0.debug
libdata/pkgconfig/QtTest.pc
@dirrm include/QtTest
diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile
index f12215ffc1a2..3cde459db48f 100644
--- a/devel/qt4-qvfb/Makefile
+++ b/devel/qt4-qvfb/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt virtual framebuffer utility
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc rcc uic corelib gui opengl
+QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib gui opengl
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/devel/qt4-qvfb/pkg-plist b/devel/qt4-qvfb/pkg-plist
index ae5639ce4ec3..f31b576acbed 100644
--- a/devel/qt4-qvfb/pkg-plist
+++ b/devel/qt4-qvfb/pkg-plist
@@ -1,5 +1,5 @@
bin/qvfb-qt4
-bin/qvfb-qt4.debug
+%%DEBUG%%bin/qvfb-qt4.debug
%%DATADIR%%/ClamshellPhone.skin/ClamshellPhone.skin
%%DATADIR%%/ClamshellPhone.skin/ClamshellPhone1-5-closed.png
%%DATADIR%%/ClamshellPhone.skin/ClamshellPhone1-5-pressed.png
diff --git a/devel/qt4-rcc/Makefile b/devel/qt4-rcc/Makefile
index 0a276bf52905..9ae1ad4ce781 100644
--- a/devel/qt4-rcc/Makefile
+++ b/devel/qt4-rcc/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt resource compiler
USE_QT_VER= 4
-QT_COMPONENTS= qmake
+QT_COMPONENTS= qmake_build
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/devel/qt4-rcc/pkg-plist b/devel/qt4-rcc/pkg-plist
index 8a57dd1cd7a4..f17a054adcb1 100644
--- a/devel/qt4-rcc/pkg-plist
+++ b/devel/qt4-rcc/pkg-plist
@@ -1,2 +1,2 @@
bin/rcc
-bin/rcc.debug
+%%DEBUG%%bin/rcc.debug
diff --git a/devel/qt4-script/Makefile b/devel/qt4-script/Makefile
index 28f1e68bc5c2..7ac82ce3cc17 100644
--- a/devel/qt4-script/Makefile
+++ b/devel/qt4-script/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt script
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc corelib
+QT_COMPONENTS= qmake_build moc_build corelib
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -45,8 +45,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME}
CONFIGURE_WRKSRC=${WRKSRC}/../../
PATCH_WRKSRC=${WRKSRC}/../../
-.include <bsd.port.pre.mk>
-
pre-configure:
${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \
@@ -59,10 +57,10 @@ pre-configure:
post-configure:
${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
- -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${WRKSRC}/Makefile
+ -e 's|.*$$(QMAKE).*||g' ${WRKSRC}/Makefile
${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
${WRKSRC}/../../lib/pkgconfig/*Qt*
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/qt4-script/pkg-plist b/devel/qt4-script/pkg-plist
index 9b91d242407b..142a03be8da1 100644
--- a/devel/qt4-script/pkg-plist
+++ b/devel/qt4-script/pkg-plist
@@ -28,5 +28,6 @@ lib/libQtScript.so
lib/libQtScript.so.4
lib/libQtScript.so.4.3
lib/libQtScript.so.4.3.0
+%%DEBUG%%lib/libQtScript.so.4.3.0.debug
libdata/pkgconfig/QtScript.pc
@dirrm include/QtScript
diff --git a/devel/qt4-uic/Makefile b/devel/qt4-uic/Makefile
index bbadecde2553..940196e76a73 100644
--- a/devel/qt4-uic/Makefile
+++ b/devel/qt4-uic/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt user interface compiler
USE_QT_VER= 4
-QT_COMPONENTS= qmake
+QT_COMPONENTS= qmake_build
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/devel/qt4-uic/pkg-plist b/devel/qt4-uic/pkg-plist
index 9ddcdc2a9202..b5060a2e10a1 100644
--- a/devel/qt4-uic/pkg-plist
+++ b/devel/qt4-uic/pkg-plist
@@ -1,2 +1,2 @@
bin/uic-qt4
-bin/uic-qt4.debug
+%%DEBUG%%bin/uic-qt4.debug
diff --git a/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile
index b83d0c891af6..c2dae7cadf67 100644
--- a/devel/qt4-uic3/Makefile
+++ b/devel/qt4-uic3/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt backwards-compatible user interface compiler
USE_QT_VER= 4
-QT_COMPONENTS= qmake qt3support corelib gui network sql xml
+QT_COMPONENTS= qmake_build qt3support corelib gui network sql xml
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/devel/qt4-uic3/pkg-plist b/devel/qt4-uic3/pkg-plist
index 36b661dbd7ba..9d3131c9d188 100644
--- a/devel/qt4-uic3/pkg-plist
+++ b/devel/qt4-uic3/pkg-plist
@@ -1,2 +1,2 @@
bin/uic3
-bin/uic3.debug
+%%DEBUG%%bin/uic3.debug
diff --git a/graphics/qt4-iconengines/Makefile b/graphics/qt4-iconengines/Makefile
index 8721d617a53d..69e31eada906 100644
--- a/graphics/qt4-iconengines/Makefile
+++ b/graphics/qt4-iconengines/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SVG icon engine plugin
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc corelib gui svg xml
+QT_COMPONENTS= qmake_build moc_build corelib gui svg xml
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -43,8 +43,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
WRKSRC= ${WRKDIR}/${DISTNAME}/src/plugins/${PORTNAME}
CONFIGURE_WRKSRC=${WRKSRC}/../../..
-.include <bsd.port.pre.mk>
-
pre-configure:
${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib/plugins/iconengines|g' \
@@ -53,4 +51,4 @@ pre-configure:
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../bin/qmake
${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../../bin/moc
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/qt4-iconengines/pkg-plist b/graphics/qt4-iconengines/pkg-plist
index d2c62653b89c..df8e9182b729 100644
--- a/graphics/qt4-iconengines/pkg-plist
+++ b/graphics/qt4-iconengines/pkg-plist
@@ -1,3 +1,3 @@
lib/plugins/iconengines/libqsvg.so
-lib/plugins/iconengines/libqsvg.so.debug
+%%DEBUG%%lib/plugins/iconengines/libqsvg.so.debug
@dirrm lib/plugins/iconengines
diff --git a/graphics/qt4-imageformats/Makefile b/graphics/qt4-imageformats/Makefile
index 0598124b8063..a85ded00688d 100644
--- a/graphics/qt4-imageformats/Makefile
+++ b/graphics/qt4-imageformats/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
tiff:${PORTSDIR}/graphics/tiff
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc rcc corelib gui svg xml
+QT_COMPONENTS= qmake_build moc_build rcc_build corelib gui svg xml
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -48,8 +48,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
WRKSRC= ${WRKDIR}/${DISTNAME}/src/plugins/${PORTNAME}
CONFIGURE_WRKSRC=${WRKSRC}/../../..
-.include <bsd.port.pre.mk>
-
pre-configure:
${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib/plugins/imageformats|g' \
@@ -66,4 +64,4 @@ post-build:
post-install:
cd ${WRKSRC}/gif; make -f Makefile install
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/qt4-imageformats/pkg-plist b/graphics/qt4-imageformats/pkg-plist
index 4f61b248e9a8..a15660aa8d84 100644
--- a/graphics/qt4-imageformats/pkg-plist
+++ b/graphics/qt4-imageformats/pkg-plist
@@ -1,11 +1,11 @@
lib/plugins/imageformats/libqgif.so
-lib/plugins/imageformats/libqgif.so.debug
+%%DEBUG%%lib/plugins/imageformats/libqgif.so.debug
lib/plugins/imageformats/libqjpeg.so
-lib/plugins/imageformats/libqjpeg.so.debug
+%%DEBUG%%lib/plugins/imageformats/libqjpeg.so.debug
lib/plugins/imageformats/libqmng.so
-lib/plugins/imageformats/libqmng.so.debug
+%%DEBUG%%lib/plugins/imageformats/libqmng.so.debug
lib/plugins/imageformats/libqsvg.so
-lib/plugins/imageformats/libqsvg.so.debug
+%%DEBUG%%lib/plugins/imageformats/libqsvg.so.debug
lib/plugins/imageformats/libqtiff.so
-lib/plugins/imageformats/libqtiff.so.debug
+%%DEBUG%%lib/plugins/imageformats/libqtiff.so.debug
@dirrm lib/plugins/imageformats
diff --git a/graphics/qt4-pixeltool/Makefile b/graphics/qt4-pixeltool/Makefile
index bd8fe5ff3a64..58fcc3e7eae9 100644
--- a/graphics/qt4-pixeltool/Makefile
+++ b/graphics/qt4-pixeltool/Makefile
@@ -19,7 +19,8 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt screen magnification utility
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc uic assistantclient corelib gui network
+QT_COMPONENTS= qmake_build moc_build uic_build assistantclient corelib gui \
+ network
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/graphics/qt4-pixeltool/pkg-plist b/graphics/qt4-pixeltool/pkg-plist
index 883736ed2f6e..04df01386af6 100644
--- a/graphics/qt4-pixeltool/pkg-plist
+++ b/graphics/qt4-pixeltool/pkg-plist
@@ -1,2 +1,2 @@
bin/pixeltool
-bin/pixeltool.debug
+%%DEBUG%%bin/pixeltool.debug
diff --git a/graphics/qt4-svg/Makefile b/graphics/qt4-svg/Makefile
index 67b4ada6bb66..7dd3a3e403bd 100644
--- a/graphics/qt4-svg/Makefile
+++ b/graphics/qt4-svg/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SVG library
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc corelib gui xml
+QT_COMPONENTS= qmake_build moc_build corelib gui xml
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -45,15 +45,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME}
CONFIGURE_WRKSRC=${WRKSRC}/../../
-.include <bsd.port.pre.mk>
-
-.if defined(PKGNAMESUFFIX) && (${PKGNAMESUFFIX} == "-debug" || ${PKGNAMESUFFIX} == "-static-debug")
-CONFIGURE_ARGS+=-debug
-.endif
-.if defined(PKGNAMESUFFIX) && (${PKGNAMESUFFIX} == "-static" || ${PKGNAMESUFFIX} == "-static-debug")
-CONFIGURE_ARGS+=-static
-.endif
-
pre-configure:
${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \
@@ -66,10 +57,10 @@ pre-configure:
post-configure:
${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
- -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${WRKSRC}/Makefile
+ -e 's|.*$$(QMAKE).*||g' ${WRKSRC}/Makefile
${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
${WRKSRC}/../../lib/pkgconfig/*Qt*
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/qt4-svg/pkg-plist b/graphics/qt4-svg/pkg-plist
index 7699fb340b95..63683b71cdab 100644
--- a/graphics/qt4-svg/pkg-plist
+++ b/graphics/qt4-svg/pkg-plist
@@ -18,5 +18,6 @@ lib/libQtSvg.so
lib/libQtSvg.so.4
lib/libQtSvg.so.4.3
lib/libQtSvg.so.4.3.0
+%%DEBUG%%lib/libQtSvg.so.4.3.0.debug
libdata/pkgconfig/QtSvg.pc
@dirrm include/QtSvg
diff --git a/japanese/qt4-codecs-jp/Makefile b/japanese/qt4-codecs-jp/Makefile
index 462b32e05169..9411066e74db 100644
--- a/japanese/qt4-codecs-jp/Makefile
+++ b/japanese/qt4-codecs-jp/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt EUC-JP/JIS codec plugins
USE_QT_VER= 4
-QT_COMPONENTS= qmake corelib
+QT_COMPONENTS= qmake_build corelib
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -46,8 +46,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
WRKSRC= ${WRKDIR}/${DISTNAME}/src/plugins/${PORTNAME}/jp
CONFIGURE_WRKSRC=${WRKSRC}/../../../..
-.include <bsd.port.pre.mk>
-
pre-configure:
${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib/plugins/codecs|g' \
@@ -56,7 +54,4 @@ pre-configure:
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../../bin/qmake
${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../../../bin/moc
-post-configure:
- ${REINPLACE_CMD} -e 's|(test -z.*||g' ${WRKSRC}/Makefile
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/qt4-codecs-jp/pkg-plist b/japanese/qt4-codecs-jp/pkg-plist
index 60fc639f5f99..6546cc22b688 100644
--- a/japanese/qt4-codecs-jp/pkg-plist
+++ b/japanese/qt4-codecs-jp/pkg-plist
@@ -1,3 +1,3 @@
lib/plugins/codecs/libqjpcodecs.so
-lib/plugins/codecs/libqjpcodecs.so.debug
+%%DEBUG%%lib/plugins/codecs/libqjpcodecs.so.debug
@dirrm lib/plugins/codecs
diff --git a/korean/qt4-codecs-kr/Makefile b/korean/qt4-codecs-kr/Makefile
index 69d008d483b6..1c58cb0dc292 100644
--- a/korean/qt4-codecs-kr/Makefile
+++ b/korean/qt4-codecs-kr/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt EUC-KR codec plugin
USE_QT_VER= 4
-QT_COMPONENTS= qmake corelib
+QT_COMPONENTS= qmake_build corelib
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -46,8 +46,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
WRKSRC= ${WRKDIR}/${DISTNAME}/src/plugins/${PORTNAME}/kr
CONFIGURE_WRKSRC=${WRKSRC}/../../../..
-.include <bsd.port.pre.mk>
-
pre-configure:
${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib/plugins/codecs|g' \
@@ -56,7 +54,5 @@ pre-configure:
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../../bin/qmake
${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../../../bin/moc
-post-configure:
- ${REINPLACE_CMD} -e 's|(test -z.*||g' ${WRKSRC}/Makefile
+.include <bsd.port.mk>
-.include <bsd.port.post.mk>
diff --git a/korean/qt4-codecs-kr/pkg-plist b/korean/qt4-codecs-kr/pkg-plist
index 5db94dbdbd13..619ee02f6528 100644
--- a/korean/qt4-codecs-kr/pkg-plist
+++ b/korean/qt4-codecs-kr/pkg-plist
@@ -1,3 +1,3 @@
lib/plugins/codecs/libqkrcodecs.so
-lib/plugins/codecs/libqkrcodecs.so.debug
+%%DEBUG%%lib/plugins/codecs/libqkrcodecs.so.debug
@dirrm lib/plugins/codecs
diff --git a/misc/qt4-doc/Makefile b/misc/qt4-doc/Makefile
index 390d53fdb929..f2da4a8c19c9 100644
--- a/misc/qt4-doc/Makefile
+++ b/misc/qt4-doc/Makefile
@@ -47,4 +47,3 @@ do-install:
.include <bsd.port.pre.mk>
.include "${.CURDIR}/../../Mk/bsd.qt.mk"
.include <bsd.port.post.mk>
-
diff --git a/misc/qt4-qtconfig/Makefile b/misc/qt4-qtconfig/Makefile
index e54ca0676657..5d96c50e56a5 100644
--- a/misc/qt4-qtconfig/Makefile
+++ b/misc/qt4-qtconfig/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt graphical configuration utility
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc rcc uic qt3support corelib
+QT_COMPONENTS= qmake_build moc_build rcc_build uic_build qt3support corelib
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/misc/qt4-qtconfig/pkg-plist b/misc/qt4-qtconfig/pkg-plist
index 79798b59b5cd..4779a9bc5a0e 100644
--- a/misc/qt4-qtconfig/pkg-plist
+++ b/misc/qt4-qtconfig/pkg-plist
@@ -1,2 +1,2 @@
bin/qtconfig-qt4
-bin/qtconfig-qt4.debug
+%%DEBUG%%bin/qtconfig-qt4.debug
diff --git a/misc/qt4-qtdemo/Makefile b/misc/qt4-qtdemo/Makefile
index b1452648e0a5..9fd0192a97ca 100644
--- a/misc/qt4-qtdemo/Makefile
+++ b/misc/qt4-qtdemo/Makefile
@@ -19,8 +19,9 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt demonstration and example programs
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc rcc uic assistantclient corelib designer gui network opengl\
- sql svg qtestlib xml imageformats dbus script
+QT_COMPONENTS= qmake_build moc_build rcc_build uic_build assistantclient \
+ corelib designer gui network opengl sql svg qtestlib xml \
+ imageformats_run dbus script
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/misc/qt4-qtdemo/pkg-plist b/misc/qt4-qtdemo/pkg-plist
index 65e2f3cd80eb..e6e469aa2c14 100644
--- a/misc/qt4-qtdemo/pkg-plist
+++ b/misc/qt4-qtdemo/pkg-plist
@@ -1,18 +1,18 @@
bin/qtdemo
-bin/qtdemo.debug
+%%DEBUG%%bin/qtdemo.debug
lib/plugins/designer/libarthurplugin.so
-lib/plugins/designer/libarthurplugin.so.debug
+%%DEBUG%%lib/plugins/designer/libarthurplugin.so.debug
lib/plugins/designer/libcontainerextension.so
-lib/plugins/designer/libcontainerextension.so.debug
+%%DEBUG%%lib/plugins/designer/libcontainerextension.so.debug
lib/plugins/designer/libcustomwidgetplugin.so
-lib/plugins/designer/libcustomwidgetplugin.so.debug
+%%DEBUG%%lib/plugins/designer/libcustomwidgetplugin.so.debug
lib/plugins/designer/libtaskmenuextension.so
-lib/plugins/designer/libtaskmenuextension.so.debug
+%%DEBUG%%lib/plugins/designer/libtaskmenuextension.so.debug
lib/plugins/designer/libworldtimeclockplugin.so
-lib/plugins/designer/libworldtimeclockplugin.so.debug
+%%DEBUG%%lib/plugins/designer/libworldtimeclockplugin.so.debug
share/qt4/demos/README
share/qt4/demos/affine/affine
-share/qt4/demos/affine/affine.debug
+%%DEBUG%%share/qt4/demos/affine/affine.debug
share/qt4/demos/affine/affine.pro
share/qt4/demos/affine/affine.qrc
share/qt4/demos/affine/bg1.jpg
@@ -38,7 +38,7 @@ share/qt4/demos/arthurplugin/xform.h
share/qt4/demos/books/bookdelegate.cpp
share/qt4/demos/books/bookdelegate.h
share/qt4/demos/books/books
-share/qt4/demos/books/books.debug
+%%DEBUG%%share/qt4/demos/books/books.debug
share/qt4/demos/books/books.pro
share/qt4/demos/books/books.qrc
share/qt4/demos/books/bookwindow.cpp
@@ -49,7 +49,7 @@ share/qt4/demos/books/initdb.h
share/qt4/demos/books/main.cpp
share/qt4/demos/chip/chip
share/qt4/demos/chip/chip.cpp
-share/qt4/demos/chip/chip.debug
+%%DEBUG%%share/qt4/demos/chip/chip.debug
share/qt4/demos/chip/chip.h
share/qt4/demos/chip/chip.pro
share/qt4/demos/chip/fileprint.png
@@ -66,7 +66,7 @@ share/qt4/demos/chip/zoomin.png
share/qt4/demos/chip/zoomout.png
share/qt4/demos/composition/composition
share/qt4/demos/composition/composition.cpp
-share/qt4/demos/composition/composition.debug
+%%DEBUG%%share/qt4/demos/composition/composition.debug
share/qt4/demos/composition/composition.h
share/qt4/demos/composition/composition.html
share/qt4/demos/composition/composition.pro
@@ -74,7 +74,7 @@ share/qt4/demos/composition/composition.qrc
share/qt4/demos/composition/flower_2.png
share/qt4/demos/composition/main.cpp
share/qt4/demos/deform/deform
-share/qt4/demos/deform/deform.debug
+%%DEBUG%%share/qt4/demos/deform/deform.debug
share/qt4/demos/deform/deform.pro
share/qt4/demos/deform/deform.qrc
share/qt4/demos/deform/main.cpp
@@ -84,7 +84,7 @@ share/qt4/demos/deform/pathdeform.html
share/qt4/demos/demos.pro
share/qt4/demos/gradients/gradients
share/qt4/demos/gradients/gradients.cpp
-share/qt4/demos/gradients/gradients.debug
+%%DEBUG%%share/qt4/demos/gradients/gradients.debug
share/qt4/demos/gradients/gradients.h
share/qt4/demos/gradients/gradients.html
share/qt4/demos/gradients/gradients.pro
@@ -95,7 +95,7 @@ share/qt4/demos/interview/images/folder.png
share/qt4/demos/interview/images/interview.png
share/qt4/demos/interview/images/services.png
share/qt4/demos/interview/interview
-share/qt4/demos/interview/interview.debug
+%%DEBUG%%share/qt4/demos/interview/interview.debug
share/qt4/demos/interview/interview.pro
share/qt4/demos/interview/interview.qrc
share/qt4/demos/interview/main.cpp
@@ -106,7 +106,7 @@ share/qt4/demos/mainwindow/colorswatch.h
share/qt4/demos/mainwindow/main.cpp
share/qt4/demos/mainwindow/mainwindow
share/qt4/demos/mainwindow/mainwindow.cpp
-share/qt4/demos/mainwindow/mainwindow.debug
+%%DEBUG%%share/qt4/demos/mainwindow/mainwindow.debug
share/qt4/demos/mainwindow/mainwindow.h
share/qt4/demos/mainwindow/mainwindow.pro
share/qt4/demos/mainwindow/mainwindow.qrc
@@ -116,7 +116,7 @@ share/qt4/demos/mainwindow/toolbar.h
share/qt4/demos/pathstroke/main.cpp
share/qt4/demos/pathstroke/pathstroke
share/qt4/demos/pathstroke/pathstroke.cpp
-share/qt4/demos/pathstroke/pathstroke.debug
+%%DEBUG%%share/qt4/demos/pathstroke/pathstroke.debug
share/qt4/demos/pathstroke/pathstroke.h
share/qt4/demos/pathstroke/pathstroke.html
share/qt4/demos/pathstroke/pathstroke.pro
@@ -224,7 +224,7 @@ share/qt4/demos/shared/shared.qrc
share/qt4/demos/spreadsheet/images/interview.png
share/qt4/demos/spreadsheet/main.cpp
share/qt4/demos/spreadsheet/spreadsheet
-share/qt4/demos/spreadsheet/spreadsheet.debug
+%%DEBUG%%share/qt4/demos/spreadsheet/spreadsheet.debug
share/qt4/demos/spreadsheet/spreadsheet.pro
share/qt4/demos/spreadsheet/spreadsheet.qrc
share/qt4/demos/sqlbrowser/browser.cpp
@@ -237,7 +237,7 @@ share/qt4/demos/sqlbrowser/qsqlconnectiondialog.cpp
share/qt4/demos/sqlbrowser/qsqlconnectiondialog.h
share/qt4/demos/sqlbrowser/qsqlconnectiondialog.ui
share/qt4/demos/sqlbrowser/sqlbrowser
-share/qt4/demos/sqlbrowser/sqlbrowser.debug
+%%DEBUG%%share/qt4/demos/sqlbrowser/sqlbrowser.debug
share/qt4/demos/sqlbrowser/sqlbrowser.pro
share/qt4/demos/textedit/example.html
share/qt4/demos/textedit/images/logo32.png
@@ -284,7 +284,7 @@ share/qt4/demos/textedit/printpreview.cpp
share/qt4/demos/textedit/printpreview.h
share/qt4/demos/textedit/textedit
share/qt4/demos/textedit/textedit.cpp
-share/qt4/demos/textedit/textedit.debug
+%%DEBUG%%share/qt4/demos/textedit/textedit.debug
share/qt4/demos/textedit/textedit.doc
share/qt4/demos/textedit/textedit.h
share/qt4/demos/textedit/textedit.pro
@@ -297,7 +297,7 @@ share/qt4/demos/undo/main.cpp
share/qt4/demos/undo/mainwindow.cpp
share/qt4/demos/undo/mainwindow.h
share/qt4/demos/undo/undo
-share/qt4/demos/undo/undo.debug
+%%DEBUG%%share/qt4/demos/undo/undo.debug
share/qt4/demos/undo/undo.pro
share/qt4/demos/undo/undo.qrc
share/qt4/examples/README
@@ -324,11 +324,11 @@ share/qt4/examples/assistant/simpletextviewer/main.cpp
share/qt4/examples/assistant/simpletextviewer/mainwindow.cpp
share/qt4/examples/assistant/simpletextviewer/mainwindow.h
share/qt4/examples/assistant/simpletextviewer/simpletextviewer
-share/qt4/examples/assistant/simpletextviewer/simpletextviewer.debug
+%%DEBUG%%share/qt4/examples/assistant/simpletextviewer/simpletextviewer.debug
share/qt4/examples/assistant/simpletextviewer/simpletextviewer.pro
share/qt4/examples/designer/README
share/qt4/examples/designer/calculatorbuilder/calculatorbuilder
-share/qt4/examples/designer/calculatorbuilder/calculatorbuilder.debug
+%%DEBUG%%share/qt4/examples/designer/calculatorbuilder/calculatorbuilder.debug
share/qt4/examples/designer/calculatorbuilder/calculatorbuilder.pro
share/qt4/examples/designer/calculatorbuilder/calculatorbuilder.qrc
share/qt4/examples/designer/calculatorbuilder/calculatorform.cpp
@@ -337,7 +337,7 @@ share/qt4/examples/designer/calculatorbuilder/calculatorform.ui
share/qt4/examples/designer/calculatorbuilder/main.cpp
share/qt4/examples/designer/calculatorform/calculatorform
share/qt4/examples/designer/calculatorform/calculatorform.cpp
-share/qt4/examples/designer/calculatorform/calculatorform.debug
+%%DEBUG%%share/qt4/examples/designer/calculatorform/calculatorform.debug
share/qt4/examples/designer/calculatorform/calculatorform.h
share/qt4/examples/designer/calculatorform/calculatorform.pro
share/qt4/examples/designer/calculatorform/calculatorform.ui
@@ -369,7 +369,7 @@ share/qt4/examples/designer/taskmenuextension/tictactoetaskmenu.h
share/qt4/examples/designer/worldtimeclockbuilder/form.ui
share/qt4/examples/designer/worldtimeclockbuilder/main.cpp
share/qt4/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder
-share/qt4/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.debug
+%%DEBUG%%share/qt4/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.debug
share/qt4/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro
share/qt4/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.qrc
share/qt4/examples/designer/worldtimeclockplugin/worldtimeclock.cpp
@@ -382,12 +382,12 @@ share/qt4/examples/desktop/desktop.pro
share/qt4/examples/desktop/screenshot/main.cpp
share/qt4/examples/desktop/screenshot/screenshot
share/qt4/examples/desktop/screenshot/screenshot.cpp
-share/qt4/examples/desktop/screenshot/screenshot.debug
+%%DEBUG%%share/qt4/examples/desktop/screenshot/screenshot.debug
share/qt4/examples/desktop/screenshot/screenshot.h
share/qt4/examples/desktop/screenshot/screenshot.pro
share/qt4/examples/desktop/systray/main.cpp
share/qt4/examples/desktop/systray/systray
-share/qt4/examples/desktop/systray/systray.debug
+%%DEBUG%%share/qt4/examples/desktop/systray/systray.debug
share/qt4/examples/desktop/systray/systray.pro
share/qt4/examples/desktop/systray/systray.qrc
share/qt4/examples/desktop/systray/window.cpp
@@ -395,13 +395,13 @@ share/qt4/examples/desktop/systray/window.h
share/qt4/examples/dialogs/README
share/qt4/examples/dialogs/classwizard/classwizard
share/qt4/examples/dialogs/classwizard/classwizard.cpp
-share/qt4/examples/dialogs/classwizard/classwizard.debug
+%%DEBUG%%share/qt4/examples/dialogs/classwizard/classwizard.debug
share/qt4/examples/dialogs/classwizard/classwizard.h
share/qt4/examples/dialogs/classwizard/classwizard.pro
share/qt4/examples/dialogs/classwizard/main.cpp
share/qt4/examples/dialogs/configdialog/configdialog
share/qt4/examples/dialogs/configdialog/configdialog.cpp
-share/qt4/examples/dialogs/configdialog/configdialog.debug
+%%DEBUG%%share/qt4/examples/dialogs/configdialog/configdialog.debug
share/qt4/examples/dialogs/configdialog/configdialog.h
share/qt4/examples/dialogs/configdialog/configdialog.pro
share/qt4/examples/dialogs/configdialog/configdialog.qrc
@@ -413,20 +413,20 @@ share/qt4/examples/dialogs/configdialog/pages.cpp
share/qt4/examples/dialogs/configdialog/pages.h
share/qt4/examples/dialogs/dialogs.pro
share/qt4/examples/dialogs/extension/extension
-share/qt4/examples/dialogs/extension/extension.debug
+%%DEBUG%%share/qt4/examples/dialogs/extension/extension.debug
share/qt4/examples/dialogs/extension/extension.pro
share/qt4/examples/dialogs/extension/finddialog.cpp
share/qt4/examples/dialogs/extension/finddialog.h
share/qt4/examples/dialogs/extension/main.cpp
share/qt4/examples/dialogs/findfiles/findfiles
-share/qt4/examples/dialogs/findfiles/findfiles.debug
+%%DEBUG%%share/qt4/examples/dialogs/findfiles/findfiles.debug
share/qt4/examples/dialogs/findfiles/findfiles.pro
share/qt4/examples/dialogs/findfiles/main.cpp
share/qt4/examples/dialogs/findfiles/window.cpp
share/qt4/examples/dialogs/findfiles/window.h
share/qt4/examples/dialogs/licensewizard/licensewizard
share/qt4/examples/dialogs/licensewizard/licensewizard.cpp
-share/qt4/examples/dialogs/licensewizard/licensewizard.debug
+%%DEBUG%%share/qt4/examples/dialogs/licensewizard/licensewizard.debug
share/qt4/examples/dialogs/licensewizard/licensewizard.h
share/qt4/examples/dialogs/licensewizard/licensewizard.pro
share/qt4/examples/dialogs/licensewizard/main.cpp
@@ -434,22 +434,22 @@ share/qt4/examples/dialogs/standarddialogs/dialog.cpp
share/qt4/examples/dialogs/standarddialogs/dialog.h
share/qt4/examples/dialogs/standarddialogs/main.cpp
share/qt4/examples/dialogs/standarddialogs/standarddialogs
-share/qt4/examples/dialogs/standarddialogs/standarddialogs.debug
+%%DEBUG%%share/qt4/examples/dialogs/standarddialogs/standarddialogs.debug
share/qt4/examples/dialogs/standarddialogs/standarddialogs.pro
share/qt4/examples/dialogs/tabdialog/main.cpp
share/qt4/examples/dialogs/tabdialog/tabdialog
share/qt4/examples/dialogs/tabdialog/tabdialog.cpp
-share/qt4/examples/dialogs/tabdialog/tabdialog.debug
+%%DEBUG%%share/qt4/examples/dialogs/tabdialog/tabdialog.debug
share/qt4/examples/dialogs/tabdialog/tabdialog.h
share/qt4/examples/dialogs/tabdialog/tabdialog.pro
share/qt4/examples/dialogs/trivialwizard/trivialwizard
share/qt4/examples/dialogs/trivialwizard/trivialwizard.cpp
-share/qt4/examples/dialogs/trivialwizard/trivialwizard.debug
+%%DEBUG%%share/qt4/examples/dialogs/trivialwizard/trivialwizard.debug
share/qt4/examples/dialogs/trivialwizard/trivialwizard.pro
share/qt4/examples/draganddrop/README
share/qt4/examples/draganddrop/draganddrop.pro
share/qt4/examples/draganddrop/draggableicons/draggableicons
-share/qt4/examples/draganddrop/draggableicons/draggableicons.debug
+%%DEBUG%%share/qt4/examples/draganddrop/draggableicons/draggableicons.debug
share/qt4/examples/draganddrop/draggableicons/draggableicons.pro
share/qt4/examples/draganddrop/draggableicons/draggableicons.qrc
share/qt4/examples/draganddrop/draggableicons/dragwidget.cpp
@@ -459,7 +459,7 @@ share/qt4/examples/draganddrop/draggableicons/images/car.png
share/qt4/examples/draganddrop/draggableicons/images/house.png
share/qt4/examples/draganddrop/draggableicons/main.cpp
share/qt4/examples/draganddrop/draggabletext/draggabletext
-share/qt4/examples/draganddrop/draggabletext/draggabletext.debug
+%%DEBUG%%share/qt4/examples/draganddrop/draggabletext/draggabletext.debug
share/qt4/examples/draganddrop/draggabletext/draggabletext.pro
share/qt4/examples/draganddrop/draggabletext/draggabletext.qrc
share/qt4/examples/draganddrop/draggabletext/draglabel.cpp
@@ -471,7 +471,7 @@ share/qt4/examples/draganddrop/draggabletext/words.txt
share/qt4/examples/draganddrop/dropsite/droparea.cpp
share/qt4/examples/draganddrop/dropsite/droparea.h
share/qt4/examples/draganddrop/dropsite/dropsite
-share/qt4/examples/draganddrop/dropsite/dropsite.debug
+%%DEBUG%%share/qt4/examples/draganddrop/dropsite/dropsite.debug
share/qt4/examples/draganddrop/dropsite/dropsite.pro
share/qt4/examples/draganddrop/dropsite/dropsitewindow.cpp
share/qt4/examples/draganddrop/dropsite/dropsitewindow.h
@@ -481,7 +481,7 @@ share/qt4/examples/draganddrop/fridgemagnets/draglabel.h
share/qt4/examples/draganddrop/fridgemagnets/dragwidget.cpp
share/qt4/examples/draganddrop/fridgemagnets/dragwidget.h
share/qt4/examples/draganddrop/fridgemagnets/fridgemagnets
-share/qt4/examples/draganddrop/fridgemagnets/fridgemagnets.debug
+%%DEBUG%%share/qt4/examples/draganddrop/fridgemagnets/fridgemagnets.debug
share/qt4/examples/draganddrop/fridgemagnets/fridgemagnets.pro
share/qt4/examples/draganddrop/fridgemagnets/fridgemagnets.qrc
share/qt4/examples/draganddrop/fridgemagnets/main.cpp
@@ -493,7 +493,7 @@ share/qt4/examples/draganddrop/puzzle/mainwindow.h
share/qt4/examples/draganddrop/puzzle/pieceslist.cpp
share/qt4/examples/draganddrop/puzzle/pieceslist.h
share/qt4/examples/draganddrop/puzzle/puzzle
-share/qt4/examples/draganddrop/puzzle/puzzle.debug
+%%DEBUG%%share/qt4/examples/draganddrop/puzzle/puzzle.debug
share/qt4/examples/draganddrop/puzzle/puzzle.pro
share/qt4/examples/draganddrop/puzzle/puzzle.qrc
share/qt4/examples/draganddrop/puzzle/puzzlewidget.cpp
@@ -501,7 +501,7 @@ share/qt4/examples/draganddrop/puzzle/puzzlewidget.h
share/qt4/examples/examples.pro
share/qt4/examples/graphicsview/README
share/qt4/examples/graphicsview/collidingmice/collidingmice
-share/qt4/examples/graphicsview/collidingmice/collidingmice.debug
+%%DEBUG%%share/qt4/examples/graphicsview/collidingmice/collidingmice.debug
share/qt4/examples/graphicsview/collidingmice/collidingmice.pro
share/qt4/examples/graphicsview/collidingmice/images/cheese.jpg
share/qt4/examples/graphicsview/collidingmice/main.cpp
@@ -514,7 +514,7 @@ share/qt4/examples/graphicsview/diagramscene/diagramitem.cpp
share/qt4/examples/graphicsview/diagramscene/diagramitem.h
share/qt4/examples/graphicsview/diagramscene/diagramscene
share/qt4/examples/graphicsview/diagramscene/diagramscene.cpp
-share/qt4/examples/graphicsview/diagramscene/diagramscene.debug
+%%DEBUG%%share/qt4/examples/graphicsview/diagramscene/diagramscene.debug
share/qt4/examples/graphicsview/diagramscene/diagramscene.h
share/qt4/examples/graphicsview/diagramscene/diagramscene.pro
share/qt4/examples/graphicsview/diagramscene/diagramscene.qrc
@@ -541,7 +541,7 @@ share/qt4/examples/graphicsview/diagramscene/mainwindow.h
share/qt4/examples/graphicsview/dragdroprobot/coloritem.cpp
share/qt4/examples/graphicsview/dragdroprobot/coloritem.h
share/qt4/examples/graphicsview/dragdroprobot/dragdroprobot
-share/qt4/examples/graphicsview/dragdroprobot/dragdroprobot.debug
+%%DEBUG%%share/qt4/examples/graphicsview/dragdroprobot/dragdroprobot.debug
share/qt4/examples/graphicsview/dragdroprobot/dragdroprobot.pro
share/qt4/examples/graphicsview/dragdroprobot/images/head.png
share/qt4/examples/graphicsview/dragdroprobot/main.cpp
@@ -551,7 +551,7 @@ share/qt4/examples/graphicsview/dragdroprobot/robot.qrc
share/qt4/examples/graphicsview/elasticnodes/edge.cpp
share/qt4/examples/graphicsview/elasticnodes/edge.h
share/qt4/examples/graphicsview/elasticnodes/elasticnodes
-share/qt4/examples/graphicsview/elasticnodes/elasticnodes.debug
+%%DEBUG%%share/qt4/examples/graphicsview/elasticnodes/elasticnodes.debug
share/qt4/examples/graphicsview/elasticnodes/elasticnodes.pro
share/qt4/examples/graphicsview/elasticnodes/graphwidget.cpp
share/qt4/examples/graphicsview/elasticnodes/graphwidget.h
@@ -566,7 +566,7 @@ share/qt4/examples/graphicsview/portedasteroids/ledmeter.cpp
share/qt4/examples/graphicsview/portedasteroids/ledmeter.h
share/qt4/examples/graphicsview/portedasteroids/main.cpp
share/qt4/examples/graphicsview/portedasteroids/portedasteroids
-share/qt4/examples/graphicsview/portedasteroids/portedasteroids.debug
+%%DEBUG%%share/qt4/examples/graphicsview/portedasteroids/portedasteroids.debug
share/qt4/examples/graphicsview/portedasteroids/portedasteroids.pro
share/qt4/examples/graphicsview/portedasteroids/portedasteroids.qrc
share/qt4/examples/graphicsview/portedasteroids/sounds/Explosion.wav
@@ -749,20 +749,20 @@ share/qt4/examples/graphicsview/portedcanvas/canvas.cpp
share/qt4/examples/graphicsview/portedcanvas/canvas.h
share/qt4/examples/graphicsview/portedcanvas/main.cpp
share/qt4/examples/graphicsview/portedcanvas/portedcanvas
-share/qt4/examples/graphicsview/portedcanvas/portedcanvas.debug
+%%DEBUG%%share/qt4/examples/graphicsview/portedcanvas/portedcanvas.debug
share/qt4/examples/graphicsview/portedcanvas/portedcanvas.pro
share/qt4/examples/graphicsview/portedcanvas/portedcanvas.qrc
share/qt4/examples/graphicsview/portedcanvas/qt-trans.xpm
share/qt4/examples/graphicsview/portedcanvas/qtlogo.png
share/qt4/examples/itemviews/README
share/qt4/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel
-share/qt4/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.debug
+%%DEBUG%%share/qt4/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.debug
share/qt4/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro
share/qt4/examples/itemviews/basicsortfiltermodel/main.cpp
share/qt4/examples/itemviews/basicsortfiltermodel/window.cpp
share/qt4/examples/itemviews/basicsortfiltermodel/window.h
share/qt4/examples/itemviews/chart/chart
-share/qt4/examples/itemviews/chart/chart.debug
+%%DEBUG%%share/qt4/examples/itemviews/chart/chart.debug
share/qt4/examples/itemviews/chart/chart.pro
share/qt4/examples/itemviews/chart/chart.qrc
share/qt4/examples/itemviews/chart/main.cpp
@@ -773,7 +773,7 @@ share/qt4/examples/itemviews/chart/pieview.cpp
share/qt4/examples/itemviews/chart/pieview.h
share/qt4/examples/itemviews/chart/qtdata.cht
share/qt4/examples/itemviews/coloreditorfactory/coloreditorfactory
-share/qt4/examples/itemviews/coloreditorfactory/coloreditorfactory.debug
+%%DEBUG%%share/qt4/examples/itemviews/coloreditorfactory/coloreditorfactory.debug
share/qt4/examples/itemviews/coloreditorfactory/coloreditorfactory.pro
share/qt4/examples/itemviews/coloreditorfactory/colorlisteditor.cpp
share/qt4/examples/itemviews/coloreditorfactory/colorlisteditor.h
@@ -781,7 +781,7 @@ share/qt4/examples/itemviews/coloreditorfactory/main.cpp
share/qt4/examples/itemviews/coloreditorfactory/window.cpp
share/qt4/examples/itemviews/coloreditorfactory/window.h
share/qt4/examples/itemviews/customsortfiltermodel/customsortfiltermodel
-share/qt4/examples/itemviews/customsortfiltermodel/customsortfiltermodel.debug
+%%DEBUG%%share/qt4/examples/itemviews/customsortfiltermodel/customsortfiltermodel.debug
share/qt4/examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro
share/qt4/examples/itemviews/customsortfiltermodel/main.cpp
share/qt4/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp
@@ -789,7 +789,7 @@ share/qt4/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.h
share/qt4/examples/itemviews/customsortfiltermodel/window.cpp
share/qt4/examples/itemviews/customsortfiltermodel/window.h
share/qt4/examples/itemviews/dirview/dirview
-share/qt4/examples/itemviews/dirview/dirview.debug
+%%DEBUG%%share/qt4/examples/itemviews/dirview/dirview.debug
share/qt4/examples/itemviews/dirview/dirview.pro
share/qt4/examples/itemviews/dirview/main.cpp
share/qt4/examples/itemviews/itemviews.pro
@@ -801,7 +801,7 @@ share/qt4/examples/itemviews/pixelator/main.cpp
share/qt4/examples/itemviews/pixelator/mainwindow.cpp
share/qt4/examples/itemviews/pixelator/mainwindow.h
share/qt4/examples/itemviews/pixelator/pixelator
-share/qt4/examples/itemviews/pixelator/pixelator.debug
+%%DEBUG%%share/qt4/examples/itemviews/pixelator/pixelator.debug
share/qt4/examples/itemviews/pixelator/pixelator.pro
share/qt4/examples/itemviews/pixelator/pixeldelegate.cpp
share/qt4/examples/itemviews/pixelator/pixeldelegate.h
@@ -812,7 +812,7 @@ share/qt4/examples/itemviews/puzzle/mainwindow.h
share/qt4/examples/itemviews/puzzle/piecesmodel.cpp
share/qt4/examples/itemviews/puzzle/piecesmodel.h
share/qt4/examples/itemviews/puzzle/puzzle
-share/qt4/examples/itemviews/puzzle/puzzle.debug
+%%DEBUG%%share/qt4/examples/itemviews/puzzle/puzzle.debug
share/qt4/examples/itemviews/puzzle/puzzle.pro
share/qt4/examples/itemviews/puzzle/puzzle.qrc
share/qt4/examples/itemviews/puzzle/puzzlewidget.cpp
@@ -825,12 +825,12 @@ share/qt4/examples/itemviews/simpledommodel/main.cpp
share/qt4/examples/itemviews/simpledommodel/mainwindow.cpp
share/qt4/examples/itemviews/simpledommodel/mainwindow.h
share/qt4/examples/itemviews/simpledommodel/simpledommodel
-share/qt4/examples/itemviews/simpledommodel/simpledommodel.debug
+%%DEBUG%%share/qt4/examples/itemviews/simpledommodel/simpledommodel.debug
share/qt4/examples/itemviews/simpledommodel/simpledommodel.pro
share/qt4/examples/itemviews/simpletreemodel/default.txt
share/qt4/examples/itemviews/simpletreemodel/main.cpp
share/qt4/examples/itemviews/simpletreemodel/simpletreemodel
-share/qt4/examples/itemviews/simpletreemodel/simpletreemodel.debug
+%%DEBUG%%share/qt4/examples/itemviews/simpletreemodel/simpletreemodel.debug
share/qt4/examples/itemviews/simpletreemodel/simpletreemodel.pro
share/qt4/examples/itemviews/simpletreemodel/simpletreemodel.qrc
share/qt4/examples/itemviews/simpletreemodel/treeitem.cpp
@@ -839,7 +839,7 @@ share/qt4/examples/itemviews/simpletreemodel/treemodel.cpp
share/qt4/examples/itemviews/simpletreemodel/treemodel.h
share/qt4/examples/itemviews/simplewidgetmapper/main.cpp
share/qt4/examples/itemviews/simplewidgetmapper/simplewidgetmapper
-share/qt4/examples/itemviews/simplewidgetmapper/simplewidgetmapper.debug
+%%DEBUG%%share/qt4/examples/itemviews/simplewidgetmapper/simplewidgetmapper.debug
share/qt4/examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro
share/qt4/examples/itemviews/simplewidgetmapper/window.cpp
share/qt4/examples/itemviews/simplewidgetmapper/window.h
@@ -847,12 +847,12 @@ share/qt4/examples/itemviews/spinboxdelegate/delegate.cpp
share/qt4/examples/itemviews/spinboxdelegate/delegate.h
share/qt4/examples/itemviews/spinboxdelegate/main.cpp
share/qt4/examples/itemviews/spinboxdelegate/spinboxdelegate
-share/qt4/examples/itemviews/spinboxdelegate/spinboxdelegate.debug
+%%DEBUG%%share/qt4/examples/itemviews/spinboxdelegate/spinboxdelegate.debug
share/qt4/examples/itemviews/spinboxdelegate/spinboxdelegate.pro
share/qt4/examples/itemviews/stardelegate/main.cpp
share/qt4/examples/itemviews/stardelegate/stardelegate
share/qt4/examples/itemviews/stardelegate/stardelegate.cpp
-share/qt4/examples/itemviews/stardelegate/stardelegate.debug
+%%DEBUG%%share/qt4/examples/itemviews/stardelegate/stardelegate.debug
share/qt4/examples/itemviews/stardelegate/stardelegate.h
share/qt4/examples/itemviews/stardelegate/stardelegate.pro
share/qt4/examples/itemviews/stardelegate/stareditor.cpp
@@ -861,14 +861,14 @@ share/qt4/examples/itemviews/stardelegate/starrating.cpp
share/qt4/examples/itemviews/stardelegate/starrating.h
share/qt4/examples/layouts/README
share/qt4/examples/layouts/basiclayouts/basiclayouts
-share/qt4/examples/layouts/basiclayouts/basiclayouts.debug
+%%DEBUG%%share/qt4/examples/layouts/basiclayouts/basiclayouts.debug
share/qt4/examples/layouts/basiclayouts/basiclayouts.pro
share/qt4/examples/layouts/basiclayouts/dialog.cpp
share/qt4/examples/layouts/basiclayouts/dialog.h
share/qt4/examples/layouts/basiclayouts/main.cpp
share/qt4/examples/layouts/borderlayout/borderlayout
share/qt4/examples/layouts/borderlayout/borderlayout.cpp
-share/qt4/examples/layouts/borderlayout/borderlayout.debug
+%%DEBUG%%share/qt4/examples/layouts/borderlayout/borderlayout.debug
share/qt4/examples/layouts/borderlayout/borderlayout.h
share/qt4/examples/layouts/borderlayout/borderlayout.pro
share/qt4/examples/layouts/borderlayout/main.cpp
@@ -877,12 +877,12 @@ share/qt4/examples/layouts/borderlayout/window.h
share/qt4/examples/layouts/dynamiclayouts/dialog.cpp
share/qt4/examples/layouts/dynamiclayouts/dialog.h
share/qt4/examples/layouts/dynamiclayouts/dynamiclayouts
-share/qt4/examples/layouts/dynamiclayouts/dynamiclayouts.debug
+%%DEBUG%%share/qt4/examples/layouts/dynamiclayouts/dynamiclayouts.debug
share/qt4/examples/layouts/dynamiclayouts/dynamiclayouts.pro
share/qt4/examples/layouts/dynamiclayouts/main.cpp
share/qt4/examples/layouts/flowlayout/flowlayout
share/qt4/examples/layouts/flowlayout/flowlayout.cpp
-share/qt4/examples/layouts/flowlayout/flowlayout.debug
+%%DEBUG%%share/qt4/examples/layouts/flowlayout/flowlayout.debug
share/qt4/examples/layouts/flowlayout/flowlayout.h
share/qt4/examples/layouts/flowlayout/flowlayout.pro
share/qt4/examples/layouts/flowlayout/main.cpp
@@ -892,14 +892,14 @@ share/qt4/examples/layouts/layouts.pro
share/qt4/examples/linguist/README
share/qt4/examples/linguist/arrowpad/arrowpad
share/qt4/examples/linguist/arrowpad/arrowpad.cpp
-share/qt4/examples/linguist/arrowpad/arrowpad.debug
+%%DEBUG%%share/qt4/examples/linguist/arrowpad/arrowpad.debug
share/qt4/examples/linguist/arrowpad/arrowpad.h
share/qt4/examples/linguist/arrowpad/arrowpad.pro
share/qt4/examples/linguist/arrowpad/main.cpp
share/qt4/examples/linguist/arrowpad/mainwindow.cpp
share/qt4/examples/linguist/arrowpad/mainwindow.h
share/qt4/examples/linguist/hellotr/hellotr
-share/qt4/examples/linguist/hellotr/hellotr.debug
+%%DEBUG%%share/qt4/examples/linguist/hellotr/hellotr.debug
share/qt4/examples/linguist/hellotr/hellotr.pro
share/qt4/examples/linguist/hellotr/main.cpp
share/qt4/examples/linguist/linguist.pro
@@ -909,12 +909,12 @@ share/qt4/examples/linguist/trollprint/mainwindow.h
share/qt4/examples/linguist/trollprint/printpanel.cpp
share/qt4/examples/linguist/trollprint/printpanel.h
share/qt4/examples/linguist/trollprint/trollprint
-share/qt4/examples/linguist/trollprint/trollprint.debug
+%%DEBUG%%share/qt4/examples/linguist/trollprint/trollprint.debug
share/qt4/examples/linguist/trollprint/trollprint.pro
share/qt4/examples/linguist/trollprint/trollprint_pt.ts
share/qt4/examples/mainwindows/README
share/qt4/examples/mainwindows/application/application
-share/qt4/examples/mainwindows/application/application.debug
+%%DEBUG%%share/qt4/examples/mainwindows/application/application.debug
share/qt4/examples/mainwindows/application/application.pro
share/qt4/examples/mainwindows/application/application.qrc
share/qt4/examples/mainwindows/application/images/copy.png
@@ -927,7 +927,7 @@ share/qt4/examples/mainwindows/application/main.cpp
share/qt4/examples/mainwindows/application/mainwindow.cpp
share/qt4/examples/mainwindows/application/mainwindow.h
share/qt4/examples/mainwindows/dockwidgets/dockwidgets
-share/qt4/examples/mainwindows/dockwidgets/dockwidgets.debug
+%%DEBUG%%share/qt4/examples/mainwindows/dockwidgets/dockwidgets.debug
share/qt4/examples/mainwindows/dockwidgets/dockwidgets.pro
share/qt4/examples/mainwindows/dockwidgets/dockwidgets.qrc
share/qt4/examples/mainwindows/dockwidgets/images/new.png
@@ -948,7 +948,7 @@ share/qt4/examples/mainwindows/mdi/main.cpp
share/qt4/examples/mainwindows/mdi/mainwindow.cpp
share/qt4/examples/mainwindows/mdi/mainwindow.h
share/qt4/examples/mainwindows/mdi/mdi
-share/qt4/examples/mainwindows/mdi/mdi.debug
+%%DEBUG%%share/qt4/examples/mainwindows/mdi/mdi.debug
share/qt4/examples/mainwindows/mdi/mdi.pro
share/qt4/examples/mainwindows/mdi/mdi.qrc
share/qt4/examples/mainwindows/mdi/mdichild.cpp
@@ -957,13 +957,13 @@ share/qt4/examples/mainwindows/menus/main.cpp
share/qt4/examples/mainwindows/menus/mainwindow.cpp
share/qt4/examples/mainwindows/menus/mainwindow.h
share/qt4/examples/mainwindows/menus/menus
-share/qt4/examples/mainwindows/menus/menus.debug
+%%DEBUG%%share/qt4/examples/mainwindows/menus/menus.debug
share/qt4/examples/mainwindows/menus/menus.pro
share/qt4/examples/mainwindows/recentfiles/main.cpp
share/qt4/examples/mainwindows/recentfiles/mainwindow.cpp
share/qt4/examples/mainwindows/recentfiles/mainwindow.h
share/qt4/examples/mainwindows/recentfiles/recentfiles
-share/qt4/examples/mainwindows/recentfiles/recentfiles.debug
+%%DEBUG%%share/qt4/examples/mainwindows/recentfiles/recentfiles.debug
share/qt4/examples/mainwindows/recentfiles/recentfiles.pro
share/qt4/examples/mainwindows/sdi/images/copy.png
share/qt4/examples/mainwindows/sdi/images/cut.png
@@ -975,32 +975,32 @@ share/qt4/examples/mainwindows/sdi/main.cpp
share/qt4/examples/mainwindows/sdi/mainwindow.cpp
share/qt4/examples/mainwindows/sdi/mainwindow.h
share/qt4/examples/mainwindows/sdi/sdi
-share/qt4/examples/mainwindows/sdi/sdi.debug
+%%DEBUG%%share/qt4/examples/mainwindows/sdi/sdi.debug
share/qt4/examples/mainwindows/sdi/sdi.pro
share/qt4/examples/mainwindows/sdi/sdi.qrc
share/qt4/examples/network/README
share/qt4/examples/network/blockingfortuneclient/blockingclient.cpp
share/qt4/examples/network/blockingfortuneclient/blockingclient.h
share/qt4/examples/network/blockingfortuneclient/blockingfortuneclient
-share/qt4/examples/network/blockingfortuneclient/blockingfortuneclient.debug
+%%DEBUG%%share/qt4/examples/network/blockingfortuneclient/blockingfortuneclient.debug
share/qt4/examples/network/blockingfortuneclient/blockingfortuneclient.pro
share/qt4/examples/network/blockingfortuneclient/fortunethread.cpp
share/qt4/examples/network/blockingfortuneclient/fortunethread.h
share/qt4/examples/network/blockingfortuneclient/main.cpp
share/qt4/examples/network/broadcastreceiver/broadcastreceiver
-share/qt4/examples/network/broadcastreceiver/broadcastreceiver.debug
+%%DEBUG%%share/qt4/examples/network/broadcastreceiver/broadcastreceiver.debug
share/qt4/examples/network/broadcastreceiver/broadcastreceiver.pro
share/qt4/examples/network/broadcastreceiver/main.cpp
share/qt4/examples/network/broadcastreceiver/receiver.cpp
share/qt4/examples/network/broadcastreceiver/receiver.h
share/qt4/examples/network/broadcastsender/broadcastsender
-share/qt4/examples/network/broadcastsender/broadcastsender.debug
+%%DEBUG%%share/qt4/examples/network/broadcastsender/broadcastsender.debug
share/qt4/examples/network/broadcastsender/broadcastsender.pro
share/qt4/examples/network/broadcastsender/main.cpp
share/qt4/examples/network/broadcastsender/sender.cpp
share/qt4/examples/network/broadcastsender/sender.h
share/qt4/examples/network/chat/chat
-share/qt4/examples/network/chat/chat.debug
+%%DEBUG%%share/qt4/examples/network/chat/chat.debug
share/qt4/examples/network/chat/chat.pro
share/qt4/examples/network/chat/chatdialog.cpp
share/qt4/examples/network/chat/chatdialog.h
@@ -1017,17 +1017,17 @@ share/qt4/examples/network/chat/server.h
share/qt4/examples/network/fortuneclient/client.cpp
share/qt4/examples/network/fortuneclient/client.h
share/qt4/examples/network/fortuneclient/fortuneclient
-share/qt4/examples/network/fortuneclient/fortuneclient.debug
+%%DEBUG%%share/qt4/examples/network/fortuneclient/fortuneclient.debug
share/qt4/examples/network/fortuneclient/fortuneclient.pro
share/qt4/examples/network/fortuneclient/main.cpp
share/qt4/examples/network/fortuneserver/fortuneserver
-share/qt4/examples/network/fortuneserver/fortuneserver.debug
+%%DEBUG%%share/qt4/examples/network/fortuneserver/fortuneserver.debug
share/qt4/examples/network/fortuneserver/fortuneserver.pro
share/qt4/examples/network/fortuneserver/main.cpp
share/qt4/examples/network/fortuneserver/server.cpp
share/qt4/examples/network/fortuneserver/server.h
share/qt4/examples/network/ftp/ftp
-share/qt4/examples/network/ftp/ftp.debug
+%%DEBUG%%share/qt4/examples/network/ftp/ftp.debug
share/qt4/examples/network/ftp/ftp.pro
share/qt4/examples/network/ftp/ftp.qrc
share/qt4/examples/network/ftp/ftpwindow.cpp
@@ -1038,7 +1038,7 @@ share/qt4/examples/network/ftp/images/file.png
share/qt4/examples/network/ftp/main.cpp
share/qt4/examples/network/http/authenticationdialog.ui
share/qt4/examples/network/http/http
-share/qt4/examples/network/http/http.debug
+%%DEBUG%%share/qt4/examples/network/http/http.debug
share/qt4/examples/network/http/http.pro
share/qt4/examples/network/http/httpwindow.cpp
share/qt4/examples/network/http/httpwindow.h
@@ -1046,7 +1046,7 @@ share/qt4/examples/network/http/main.cpp
share/qt4/examples/network/loopback/dialog.cpp
share/qt4/examples/network/loopback/dialog.h
share/qt4/examples/network/loopback/loopback
-share/qt4/examples/network/loopback/loopback.debug
+%%DEBUG%%share/qt4/examples/network/loopback/loopback.debug
share/qt4/examples/network/loopback/loopback.pro
share/qt4/examples/network/loopback/main.cpp
share/qt4/examples/network/network.pro
@@ -1058,7 +1058,7 @@ share/qt4/examples/network/threadedfortuneserver/fortunethread.cpp
share/qt4/examples/network/threadedfortuneserver/fortunethread.h
share/qt4/examples/network/threadedfortuneserver/main.cpp
share/qt4/examples/network/threadedfortuneserver/threadedfortuneserver
-share/qt4/examples/network/threadedfortuneserver/threadedfortuneserver.debug
+%%DEBUG%%share/qt4/examples/network/threadedfortuneserver/threadedfortuneserver.debug
share/qt4/examples/network/threadedfortuneserver/threadedfortuneserver.pro
share/qt4/examples/network/torrent/3rdparty/sha1.c
share/qt4/examples/network/torrent/3rdparty/sha1.h
@@ -1093,7 +1093,7 @@ share/qt4/examples/network/torrent/peerwireclient.h
share/qt4/examples/network/torrent/ratecontroller.cpp
share/qt4/examples/network/torrent/ratecontroller.h
share/qt4/examples/network/torrent/torrent
-share/qt4/examples/network/torrent/torrent.debug
+%%DEBUG%%share/qt4/examples/network/torrent/torrent.debug
share/qt4/examples/network/torrent/torrent.pro
share/qt4/examples/network/torrent/torrentclient.cpp
share/qt4/examples/network/torrent/torrentclient.h
@@ -1102,7 +1102,7 @@ share/qt4/examples/network/torrent/torrentserver.h
share/qt4/examples/network/torrent/trackerclient.cpp
share/qt4/examples/network/torrent/trackerclient.h
share/qt4/examples/opengl/2dpainting/2dpainting
-share/qt4/examples/opengl/2dpainting/2dpainting.debug
+%%DEBUG%%share/qt4/examples/opengl/2dpainting/2dpainting.debug
share/qt4/examples/opengl/2dpainting/2dpainting.pro
share/qt4/examples/opengl/2dpainting/glwidget.cpp
share/qt4/examples/opengl/2dpainting/glwidget.h
@@ -1116,7 +1116,7 @@ share/qt4/examples/opengl/2dpainting/window.h
share/qt4/examples/opengl/README
share/qt4/examples/opengl/framebufferobject/bubbles.svg
share/qt4/examples/opengl/framebufferobject/framebufferobject
-share/qt4/examples/opengl/framebufferobject/framebufferobject.debug
+%%DEBUG%%share/qt4/examples/opengl/framebufferobject/framebufferobject.debug
share/qt4/examples/opengl/framebufferobject/framebufferobject.pro
share/qt4/examples/opengl/framebufferobject/framebufferobject.qrc
share/qt4/examples/opengl/framebufferobject/glwidget.cpp
@@ -1125,7 +1125,7 @@ share/qt4/examples/opengl/framebufferobject/main.cpp
share/qt4/examples/opengl/framebufferobject/qt4-logo.png
share/qt4/examples/opengl/framebufferobject2/cubelogo.png
share/qt4/examples/opengl/framebufferobject2/framebufferobject2
-share/qt4/examples/opengl/framebufferobject2/framebufferobject2.debug
+%%DEBUG%%share/qt4/examples/opengl/framebufferobject2/framebufferobject2.debug
share/qt4/examples/opengl/framebufferobject2/framebufferobject2.pro
share/qt4/examples/opengl/framebufferobject2/framebufferobject2.qrc
share/qt4/examples/opengl/framebufferobject2/glwidget.cpp
@@ -1134,7 +1134,7 @@ share/qt4/examples/opengl/framebufferobject2/main.cpp
share/qt4/examples/opengl/grabber/glwidget.cpp
share/qt4/examples/opengl/grabber/glwidget.h
share/qt4/examples/opengl/grabber/grabber
-share/qt4/examples/opengl/grabber/grabber.debug
+%%DEBUG%%share/qt4/examples/opengl/grabber/grabber.debug
share/qt4/examples/opengl/grabber/grabber.pro
share/qt4/examples/opengl/grabber/main.cpp
share/qt4/examples/opengl/grabber/mainwindow.cpp
@@ -1142,7 +1142,7 @@ share/qt4/examples/opengl/grabber/mainwindow.h
share/qt4/examples/opengl/hellogl/glwidget.cpp
share/qt4/examples/opengl/hellogl/glwidget.h
share/qt4/examples/opengl/hellogl/hellogl
-share/qt4/examples/opengl/hellogl/hellogl.debug
+%%DEBUG%%share/qt4/examples/opengl/hellogl/hellogl.debug
share/qt4/examples/opengl/hellogl/hellogl.pro
share/qt4/examples/opengl/hellogl/main.cpp
share/qt4/examples/opengl/hellogl/window.cpp
@@ -1154,14 +1154,14 @@ share/qt4/examples/opengl/overpainting/glwidget.cpp
share/qt4/examples/opengl/overpainting/glwidget.h
share/qt4/examples/opengl/overpainting/main.cpp
share/qt4/examples/opengl/overpainting/overpainting
-share/qt4/examples/opengl/overpainting/overpainting.debug
+%%DEBUG%%share/qt4/examples/opengl/overpainting/overpainting.debug
share/qt4/examples/opengl/overpainting/overpainting.pro
share/qt4/examples/opengl/pbuffers/cubelogo.png
share/qt4/examples/opengl/pbuffers/glwidget.cpp
share/qt4/examples/opengl/pbuffers/glwidget.h
share/qt4/examples/opengl/pbuffers/main.cpp
share/qt4/examples/opengl/pbuffers/pbuffers
-share/qt4/examples/opengl/pbuffers/pbuffers.debug
+%%DEBUG%%share/qt4/examples/opengl/pbuffers/pbuffers.debug
share/qt4/examples/opengl/pbuffers/pbuffers.pro
share/qt4/examples/opengl/pbuffers/pbuffers.qrc
share/qt4/examples/opengl/pbuffers2/bubbles.svg
@@ -1169,7 +1169,7 @@ share/qt4/examples/opengl/pbuffers2/glwidget.cpp
share/qt4/examples/opengl/pbuffers2/glwidget.h
share/qt4/examples/opengl/pbuffers2/main.cpp
share/qt4/examples/opengl/pbuffers2/pbuffers2
-share/qt4/examples/opengl/pbuffers2/pbuffers2.debug
+%%DEBUG%%share/qt4/examples/opengl/pbuffers2/pbuffers2.debug
share/qt4/examples/opengl/pbuffers2/pbuffers2.pro
share/qt4/examples/opengl/pbuffers2/pbuffers2.qrc
share/qt4/examples/opengl/pbuffers2/qt4-logo.png
@@ -1177,7 +1177,7 @@ share/qt4/examples/opengl/samplebuffers/glwidget.cpp
share/qt4/examples/opengl/samplebuffers/glwidget.h
share/qt4/examples/opengl/samplebuffers/main.cpp
share/qt4/examples/opengl/samplebuffers/samplebuffers
-share/qt4/examples/opengl/samplebuffers/samplebuffers.debug
+%%DEBUG%%share/qt4/examples/opengl/samplebuffers/samplebuffers.debug
share/qt4/examples/opengl/samplebuffers/samplebuffers.pro
share/qt4/examples/opengl/textures/glwidget.cpp
share/qt4/examples/opengl/textures/glwidget.h
@@ -1189,14 +1189,14 @@ share/qt4/examples/opengl/textures/images/side5.png
share/qt4/examples/opengl/textures/images/side6.png
share/qt4/examples/opengl/textures/main.cpp
share/qt4/examples/opengl/textures/textures
-share/qt4/examples/opengl/textures/textures.debug
+%%DEBUG%%share/qt4/examples/opengl/textures/textures.debug
share/qt4/examples/opengl/textures/textures.pro
share/qt4/examples/opengl/textures/textures.qrc
share/qt4/examples/opengl/textures/window.cpp
share/qt4/examples/opengl/textures/window.h
share/qt4/examples/painting/README
share/qt4/examples/painting/basicdrawing/basicdrawing
-share/qt4/examples/painting/basicdrawing/basicdrawing.debug
+%%DEBUG%%share/qt4/examples/painting/basicdrawing/basicdrawing.debug
share/qt4/examples/painting/basicdrawing/basicdrawing.pro
share/qt4/examples/painting/basicdrawing/basicdrawing.qrc
share/qt4/examples/painting/basicdrawing/images/brick.png
@@ -1209,13 +1209,13 @@ share/qt4/examples/painting/basicdrawing/window.h
share/qt4/examples/painting/concentriccircles/circlewidget.cpp
share/qt4/examples/painting/concentriccircles/circlewidget.h
share/qt4/examples/painting/concentriccircles/concentriccircles
-share/qt4/examples/painting/concentriccircles/concentriccircles.debug
+%%DEBUG%%share/qt4/examples/painting/concentriccircles/concentriccircles.debug
share/qt4/examples/painting/concentriccircles/concentriccircles.pro
share/qt4/examples/painting/concentriccircles/main.cpp
share/qt4/examples/painting/concentriccircles/window.cpp
share/qt4/examples/painting/concentriccircles/window.h
share/qt4/examples/painting/fontsampler/fontsampler
-share/qt4/examples/painting/fontsampler/fontsampler.debug
+%%DEBUG%%share/qt4/examples/painting/fontsampler/fontsampler.debug
share/qt4/examples/painting/fontsampler/fontsampler.pro
share/qt4/examples/painting/fontsampler/main.cpp
share/qt4/examples/painting/fontsampler/mainwindow.cpp
@@ -1229,7 +1229,7 @@ share/qt4/examples/painting/fontsampler/previewlabel.h
share/qt4/examples/painting/imagecomposition/imagecomposer.cpp
share/qt4/examples/painting/imagecomposition/imagecomposer.h
share/qt4/examples/painting/imagecomposition/imagecomposition
-share/qt4/examples/painting/imagecomposition/imagecomposition.debug
+%%DEBUG%%share/qt4/examples/painting/imagecomposition/imagecomposition.debug
share/qt4/examples/painting/imagecomposition/imagecomposition.pro
share/qt4/examples/painting/imagecomposition/imagecomposition.qrc
share/qt4/examples/painting/imagecomposition/images/background.png
@@ -1239,7 +1239,7 @@ share/qt4/examples/painting/imagecomposition/images/checker.png
share/qt4/examples/painting/imagecomposition/main.cpp
share/qt4/examples/painting/painterpaths/main.cpp
share/qt4/examples/painting/painterpaths/painterpaths
-share/qt4/examples/painting/painterpaths/painterpaths.debug
+%%DEBUG%%share/qt4/examples/painting/painterpaths/painterpaths.debug
share/qt4/examples/painting/painterpaths/painterpaths.pro
share/qt4/examples/painting/painterpaths/renderarea.cpp
share/qt4/examples/painting/painterpaths/renderarea.h
@@ -1255,7 +1255,7 @@ share/qt4/examples/painting/svgviewer/mainwindow.h
share/qt4/examples/painting/svgviewer/svgview.cpp
share/qt4/examples/painting/svgviewer/svgview.h
share/qt4/examples/painting/svgviewer/svgviewer
-share/qt4/examples/painting/svgviewer/svgviewer.debug
+%%DEBUG%%share/qt4/examples/painting/svgviewer/svgviewer.debug
share/qt4/examples/painting/svgviewer/svgviewer.pro
share/qt4/examples/painting/svgviewer/svgviewer.qrc
share/qt4/examples/painting/svgviewer/svgwindow.cpp
@@ -1264,13 +1264,13 @@ share/qt4/examples/painting/transformations/main.cpp
share/qt4/examples/painting/transformations/renderarea.cpp
share/qt4/examples/painting/transformations/renderarea.h
share/qt4/examples/painting/transformations/transformations
-share/qt4/examples/painting/transformations/transformations.debug
+%%DEBUG%%share/qt4/examples/painting/transformations/transformations.debug
share/qt4/examples/painting/transformations/transformations.pro
share/qt4/examples/painting/transformations/window.cpp
share/qt4/examples/painting/transformations/window.h
share/qt4/examples/qdbus/chat/chat
share/qt4/examples/qdbus/chat/chat.cpp
-share/qt4/examples/qdbus/chat/chat.debug
+%%DEBUG%%share/qt4/examples/qdbus/chat/chat.debug
share/qt4/examples/qdbus/chat/chat.h
share/qt4/examples/qdbus/chat/chat.pro
share/qt4/examples/qdbus/chat/chat_adaptor.cpp
@@ -1282,35 +1282,35 @@ share/qt4/examples/qdbus/chat/chatsetnickname.ui
share/qt4/examples/qdbus/chat/com.trolltech.chat.xml
share/qt4/examples/qdbus/complexpingpong/complexping
share/qt4/examples/qdbus/complexpingpong/complexping.cpp
-share/qt4/examples/qdbus/complexpingpong/complexping.debug
+%%DEBUG%%share/qt4/examples/qdbus/complexpingpong/complexping.debug
share/qt4/examples/qdbus/complexpingpong/complexping.h
share/qt4/examples/qdbus/complexpingpong/complexping.pro
share/qt4/examples/qdbus/complexpingpong/complexpingpong.pro
share/qt4/examples/qdbus/complexpingpong/complexpong
share/qt4/examples/qdbus/complexpingpong/complexpong.cpp
-share/qt4/examples/qdbus/complexpingpong/complexpong.debug
+%%DEBUG%%share/qt4/examples/qdbus/complexpingpong/complexpong.debug
share/qt4/examples/qdbus/complexpingpong/complexpong.h
share/qt4/examples/qdbus/complexpingpong/complexpong.pro
share/qt4/examples/qdbus/complexpingpong/ping-common.h
share/qt4/examples/qdbus/listnames/listnames
share/qt4/examples/qdbus/listnames/listnames.cpp
-share/qt4/examples/qdbus/listnames/listnames.debug
+%%DEBUG%%share/qt4/examples/qdbus/listnames/listnames.debug
share/qt4/examples/qdbus/listnames/listnames.pro
share/qt4/examples/qdbus/pingpong/ping
share/qt4/examples/qdbus/pingpong/ping-common.h
share/qt4/examples/qdbus/pingpong/ping.cpp
-share/qt4/examples/qdbus/pingpong/ping.debug
+%%DEBUG%%share/qt4/examples/qdbus/pingpong/ping.debug
share/qt4/examples/qdbus/pingpong/ping.pro
share/qt4/examples/qdbus/pingpong/pingpong.pro
share/qt4/examples/qdbus/pingpong/pong
share/qt4/examples/qdbus/pingpong/pong.cpp
-share/qt4/examples/qdbus/pingpong/pong.debug
+%%DEBUG%%share/qt4/examples/qdbus/pingpong/pong.debug
share/qt4/examples/qdbus/pingpong/pong.h
share/qt4/examples/qdbus/pingpong/pong.pro
share/qt4/examples/qdbus/qdbus.pro
share/qt4/examples/qdbus/remotecontrolledcar/car/car
share/qt4/examples/qdbus/remotecontrolledcar/car/car.cpp
-share/qt4/examples/qdbus/remotecontrolledcar/car/car.debug
+%%DEBUG%%share/qt4/examples/qdbus/remotecontrolledcar/car/car.debug
share/qt4/examples/qdbus/remotecontrolledcar/car/car.h
share/qt4/examples/qdbus/remotecontrolledcar/car/car.pro
share/qt4/examples/qdbus/remotecontrolledcar/car/car.xml
@@ -1322,7 +1322,7 @@ share/qt4/examples/qdbus/remotecontrolledcar/controller/car_interface.cpp
share/qt4/examples/qdbus/remotecontrolledcar/controller/car_interface_p.h
share/qt4/examples/qdbus/remotecontrolledcar/controller/controller
share/qt4/examples/qdbus/remotecontrolledcar/controller/controller.cpp
-share/qt4/examples/qdbus/remotecontrolledcar/controller/controller.debug
+%%DEBUG%%share/qt4/examples/qdbus/remotecontrolledcar/controller/controller.debug
share/qt4/examples/qdbus/remotecontrolledcar/controller/controller.h
share/qt4/examples/qdbus/remotecontrolledcar/controller/controller.pro
share/qt4/examples/qdbus/remotecontrolledcar/controller/controller.ui
@@ -1332,23 +1332,23 @@ share/qt4/examples/qtestlib/README
share/qt4/examples/qtestlib/qtestlib.pro
share/qt4/examples/qtestlib/tutorial1/testqstring.cpp
share/qt4/examples/qtestlib/tutorial1/tutorial1
-share/qt4/examples/qtestlib/tutorial1/tutorial1.debug
+%%DEBUG%%share/qt4/examples/qtestlib/tutorial1/tutorial1.debug
share/qt4/examples/qtestlib/tutorial1/tutorial1.pro
share/qt4/examples/qtestlib/tutorial2/testqstring.cpp
share/qt4/examples/qtestlib/tutorial2/tutorial2
-share/qt4/examples/qtestlib/tutorial2/tutorial2.debug
+%%DEBUG%%share/qt4/examples/qtestlib/tutorial2/tutorial2.debug
share/qt4/examples/qtestlib/tutorial2/tutorial2.pro
share/qt4/examples/qtestlib/tutorial3/testgui.cpp
share/qt4/examples/qtestlib/tutorial3/tutorial3
-share/qt4/examples/qtestlib/tutorial3/tutorial3.debug
+%%DEBUG%%share/qt4/examples/qtestlib/tutorial3/tutorial3.debug
share/qt4/examples/qtestlib/tutorial3/tutorial3.pro
share/qt4/examples/qtestlib/tutorial4/testgui.cpp
share/qt4/examples/qtestlib/tutorial4/tutorial4
-share/qt4/examples/qtestlib/tutorial4/tutorial4.debug
+%%DEBUG%%share/qt4/examples/qtestlib/tutorial4/tutorial4.debug
share/qt4/examples/qtestlib/tutorial4/tutorial4.pro
share/qt4/examples/richtext/README
share/qt4/examples/richtext/calendar/calendar
-share/qt4/examples/richtext/calendar/calendar.debug
+%%DEBUG%%share/qt4/examples/richtext/calendar/calendar.debug
share/qt4/examples/richtext/calendar/calendar.pro
share/qt4/examples/richtext/calendar/main.cpp
share/qt4/examples/richtext/calendar/mainwindow.cpp
@@ -1359,7 +1359,7 @@ share/qt4/examples/richtext/orderform/main.cpp
share/qt4/examples/richtext/orderform/mainwindow.cpp
share/qt4/examples/richtext/orderform/mainwindow.h
share/qt4/examples/richtext/orderform/orderform
-share/qt4/examples/richtext/orderform/orderform.debug
+%%DEBUG%%share/qt4/examples/richtext/orderform/orderform.debug
share/qt4/examples/richtext/orderform/orderform.pro
share/qt4/examples/richtext/richtext.pro
share/qt4/examples/richtext/syntaxhighlighter/highlighter.cpp
@@ -1368,17 +1368,17 @@ share/qt4/examples/richtext/syntaxhighlighter/main.cpp
share/qt4/examples/richtext/syntaxhighlighter/mainwindow.cpp
share/qt4/examples/richtext/syntaxhighlighter/mainwindow.h
share/qt4/examples/richtext/syntaxhighlighter/syntaxhighlighter
-share/qt4/examples/richtext/syntaxhighlighter/syntaxhighlighter.debug
+%%DEBUG%%share/qt4/examples/richtext/syntaxhighlighter/syntaxhighlighter.debug
share/qt4/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro
share/qt4/examples/script/README
share/qt4/examples/script/calculator/calculator
-share/qt4/examples/script/calculator/calculator.debug
+%%DEBUG%%share/qt4/examples/script/calculator/calculator.debug
share/qt4/examples/script/calculator/calculator.pro
share/qt4/examples/script/calculator/calculator.qrc
share/qt4/examples/script/calculator/main.cpp
share/qt4/examples/script/context2d/context2d
share/qt4/examples/script/context2d/context2d.cpp
-share/qt4/examples/script/context2d/context2d.debug
+%%DEBUG%%share/qt4/examples/script/context2d/context2d.debug
share/qt4/examples/script/context2d/context2d.h
share/qt4/examples/script/context2d/context2d.pro
share/qt4/examples/script/context2d/context2d.qrc
@@ -1409,24 +1409,24 @@ share/qt4/examples/script/context2d/scripts/translate.js
share/qt4/examples/script/context2d/window.cpp
share/qt4/examples/script/context2d/window.h
share/qt4/examples/script/defaultprototypes/defaultprototypes
-share/qt4/examples/script/defaultprototypes/defaultprototypes.debug
+%%DEBUG%%share/qt4/examples/script/defaultprototypes/defaultprototypes.debug
share/qt4/examples/script/defaultprototypes/defaultprototypes.pro
share/qt4/examples/script/defaultprototypes/defaultprototypes.qrc
share/qt4/examples/script/defaultprototypes/main.cpp
share/qt4/examples/script/defaultprototypes/prototypes.cpp
share/qt4/examples/script/defaultprototypes/prototypes.h
share/qt4/examples/script/helloscript/helloscript
-share/qt4/examples/script/helloscript/helloscript.debug
+%%DEBUG%%share/qt4/examples/script/helloscript/helloscript.debug
share/qt4/examples/script/helloscript/helloscript.pro
share/qt4/examples/script/helloscript/main.cpp
share/qt4/examples/script/qscript/main.cpp
share/qt4/examples/script/qscript/qscript
-share/qt4/examples/script/qscript/qscript.debug
+%%DEBUG%%share/qt4/examples/script/qscript/qscript.debug
share/qt4/examples/script/qscript/qscript.pro
share/qt4/examples/script/script.pro
share/qt4/examples/script/tetrix/main.cpp
share/qt4/examples/script/tetrix/tetrix
-share/qt4/examples/script/tetrix/tetrix.debug
+%%DEBUG%%share/qt4/examples/script/tetrix/tetrix.debug
share/qt4/examples/script/tetrix/tetrix.pro
share/qt4/examples/script/tetrix/tetrix.qrc
share/qt4/examples/script/tetrix/tetrixboard.cpp
@@ -1434,14 +1434,14 @@ share/qt4/examples/script/tetrix/tetrixboard.h
share/qt4/examples/script/tetrix/tetrixwindow.ui
share/qt4/examples/sql/README
share/qt4/examples/sql/cachedtable/cachedtable
-share/qt4/examples/sql/cachedtable/cachedtable.debug
+%%DEBUG%%share/qt4/examples/sql/cachedtable/cachedtable.debug
share/qt4/examples/sql/cachedtable/cachedtable.pro
share/qt4/examples/sql/cachedtable/main.cpp
share/qt4/examples/sql/cachedtable/tableeditor.cpp
share/qt4/examples/sql/cachedtable/tableeditor.h
share/qt4/examples/sql/connection.h
share/qt4/examples/sql/drilldown/drilldown
-share/qt4/examples/sql/drilldown/drilldown.debug
+%%DEBUG%%share/qt4/examples/sql/drilldown/drilldown.debug
share/qt4/examples/sql/drilldown/drilldown.pro
share/qt4/examples/sql/drilldown/drilldown.qrc
share/qt4/examples/sql/drilldown/imageitem.cpp
@@ -1458,7 +1458,7 @@ share/qt4/examples/sql/masterdetail/main.cpp
share/qt4/examples/sql/masterdetail/mainwindow.cpp
share/qt4/examples/sql/masterdetail/mainwindow.h
share/qt4/examples/sql/masterdetail/masterdetail
-share/qt4/examples/sql/masterdetail/masterdetail.debug
+%%DEBUG%%share/qt4/examples/sql/masterdetail/masterdetail.debug
share/qt4/examples/sql/masterdetail/masterdetail.pro
share/qt4/examples/sql/masterdetail/masterdetail.qrc
share/qt4/examples/sql/querymodel/customsqlmodel.cpp
@@ -1467,21 +1467,21 @@ share/qt4/examples/sql/querymodel/editablesqlmodel.cpp
share/qt4/examples/sql/querymodel/editablesqlmodel.h
share/qt4/examples/sql/querymodel/main.cpp
share/qt4/examples/sql/querymodel/querymodel
-share/qt4/examples/sql/querymodel/querymodel.debug
+%%DEBUG%%share/qt4/examples/sql/querymodel/querymodel.debug
share/qt4/examples/sql/querymodel/querymodel.pro
share/qt4/examples/sql/relationaltablemodel/relationaltablemodel
share/qt4/examples/sql/relationaltablemodel/relationaltablemodel.cpp
-share/qt4/examples/sql/relationaltablemodel/relationaltablemodel.debug
+%%DEBUG%%share/qt4/examples/sql/relationaltablemodel/relationaltablemodel.debug
share/qt4/examples/sql/relationaltablemodel/relationaltablemodel.pro
share/qt4/examples/sql/sql.pro
share/qt4/examples/sql/tablemodel/tablemodel
share/qt4/examples/sql/tablemodel/tablemodel.cpp
-share/qt4/examples/sql/tablemodel/tablemodel.debug
+%%DEBUG%%share/qt4/examples/sql/tablemodel/tablemodel.debug
share/qt4/examples/sql/tablemodel/tablemodel.pro
share/qt4/examples/threads/README
share/qt4/examples/threads/mandelbrot/main.cpp
share/qt4/examples/threads/mandelbrot/mandelbrot
-share/qt4/examples/threads/mandelbrot/mandelbrot.debug
+%%DEBUG%%share/qt4/examples/threads/mandelbrot/mandelbrot.debug
share/qt4/examples/threads/mandelbrot/mandelbrot.pro
share/qt4/examples/threads/mandelbrot/mandelbrotwidget.cpp
share/qt4/examples/threads/mandelbrot/mandelbrotwidget.h
@@ -1489,16 +1489,16 @@ share/qt4/examples/threads/mandelbrot/renderthread.cpp
share/qt4/examples/threads/mandelbrot/renderthread.h
share/qt4/examples/threads/semaphores/semaphores
share/qt4/examples/threads/semaphores/semaphores.cpp
-share/qt4/examples/threads/semaphores/semaphores.debug
+%%DEBUG%%share/qt4/examples/threads/semaphores/semaphores.debug
share/qt4/examples/threads/semaphores/semaphores.pro
share/qt4/examples/threads/threads.pro
share/qt4/examples/threads/waitconditions/waitconditions
share/qt4/examples/threads/waitconditions/waitconditions.cpp
-share/qt4/examples/threads/waitconditions/waitconditions.debug
+%%DEBUG%%share/qt4/examples/threads/waitconditions/waitconditions.debug
share/qt4/examples/threads/waitconditions/waitconditions.pro
share/qt4/examples/tools/README
share/qt4/examples/tools/codecs/codecs
-share/qt4/examples/tools/codecs/codecs.debug
+%%DEBUG%%share/qt4/examples/tools/codecs/codecs.debug
share/qt4/examples/tools/codecs/codecs.pro
share/qt4/examples/tools/codecs/encodedfiles/iso-8859-1.txt
share/qt4/examples/tools/codecs/encodedfiles/iso-8859-15.txt
@@ -1512,7 +1512,7 @@ share/qt4/examples/tools/codecs/mainwindow.h
share/qt4/examples/tools/codecs/previewform.cpp
share/qt4/examples/tools/codecs/previewform.h
share/qt4/examples/tools/completer/completer
-share/qt4/examples/tools/completer/completer.debug
+%%DEBUG%%share/qt4/examples/tools/completer/completer.debug
share/qt4/examples/tools/completer/completer.pro
share/qt4/examples/tools/completer/completer.qrc
share/qt4/examples/tools/completer/dirmodel.cpp
@@ -1523,7 +1523,7 @@ share/qt4/examples/tools/completer/mainwindow.h
share/qt4/examples/tools/completer/resources/countries.txt
share/qt4/examples/tools/completer/resources/wordlist.txt
share/qt4/examples/tools/customcompleter/customcompleter
-share/qt4/examples/tools/customcompleter/customcompleter.debug
+%%DEBUG%%share/qt4/examples/tools/customcompleter/customcompleter.debug
share/qt4/examples/tools/customcompleter/customcompleter.pro
share/qt4/examples/tools/customcompleter/customcompleter.qrc
share/qt4/examples/tools/customcompleter/main.cpp
@@ -1542,10 +1542,10 @@ share/qt4/examples/tools/echoplugin/echowindow/main.cpp
share/qt4/examples/tools/echoplugin/plugin/echoplugin.cpp
share/qt4/examples/tools/echoplugin/plugin/echoplugin.h
share/qt4/examples/tools/echoplugin/plugin/libechoplugin.so
-share/qt4/examples/tools/echoplugin/plugin/libechoplugin.so.debug
+%%DEBUG%%share/qt4/examples/tools/echoplugin/plugin/libechoplugin.so.debug
share/qt4/examples/tools/echoplugin/plugin/plugin.pro
share/qt4/examples/tools/i18n/i18n
-share/qt4/examples/tools/i18n/i18n.debug
+%%DEBUG%%share/qt4/examples/tools/i18n/i18n.debug
share/qt4/examples/tools/i18n/i18n.pro
share/qt4/examples/tools/i18n/i18n.qrc
share/qt4/examples/tools/i18n/languagechooser.cpp
@@ -1588,13 +1588,13 @@ share/qt4/examples/tools/plugandpaint/mainwindow.h
share/qt4/examples/tools/plugandpaint/paintarea.cpp
share/qt4/examples/tools/plugandpaint/paintarea.h
share/qt4/examples/tools/plugandpaint/plugandpaint
-share/qt4/examples/tools/plugandpaint/plugandpaint.debug
+%%DEBUG%%share/qt4/examples/tools/plugandpaint/plugandpaint.debug
share/qt4/examples/tools/plugandpaint/plugandpaint.pro
share/qt4/examples/tools/plugandpaint/plugindialog.cpp
share/qt4/examples/tools/plugandpaint/plugindialog.h
share/qt4/examples/tools/plugandpaint/plugins/libpnp_basictools.a
share/qt4/examples/tools/plugandpaint/plugins/libpnp_extrafilters.so
-share/qt4/examples/tools/plugandpaint/plugins/libpnp_extrafilters.so.debug
+%%DEBUG%%share/qt4/examples/tools/plugandpaint/plugins/libpnp_extrafilters.so.debug
share/qt4/examples/tools/plugandpaintplugins/basictools/basictools.pro
share/qt4/examples/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp
share/qt4/examples/tools/plugandpaintplugins/basictools/basictoolsplugin.h
@@ -1604,7 +1604,7 @@ share/qt4/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h
share/qt4/examples/tools/plugandpaintplugins/plugandpaintplugins.pro
share/qt4/examples/tools/regexp/main.cpp
share/qt4/examples/tools/regexp/regexp
-share/qt4/examples/tools/regexp/regexp.debug
+%%DEBUG%%share/qt4/examples/tools/regexp/regexp.debug
share/qt4/examples/tools/regexp/regexp.pro
share/qt4/examples/tools/regexp/regexpdialog.cpp
share/qt4/examples/tools/regexp/regexpdialog.h
@@ -1616,7 +1616,7 @@ share/qt4/examples/tools/settingseditor/main.cpp
share/qt4/examples/tools/settingseditor/mainwindow.cpp
share/qt4/examples/tools/settingseditor/mainwindow.h
share/qt4/examples/tools/settingseditor/settingseditor
-share/qt4/examples/tools/settingseditor/settingseditor.debug
+%%DEBUG%%share/qt4/examples/tools/settingseditor/settingseditor.debug
share/qt4/examples/tools/settingseditor/settingseditor.pro
share/qt4/examples/tools/settingseditor/settingstree.cpp
share/qt4/examples/tools/settingseditor/settingstree.h
@@ -1631,7 +1631,7 @@ share/qt4/examples/tools/styleplugin/styleplugin.pro
share/qt4/examples/tools/styleplugin/stylewindow/main.cpp
share/qt4/examples/tools/styleplugin/stylewindow/styleplugin
share/qt4/examples/tools/styleplugin/stylewindow/styles/libsimplestyleplugin.so
-share/qt4/examples/tools/styleplugin/stylewindow/styles/libsimplestyleplugin.so.debug
+%%DEBUG%%share/qt4/examples/tools/styleplugin/stylewindow/styles/libsimplestyleplugin.so.debug
share/qt4/examples/tools/styleplugin/stylewindow/stylewindow.cpp
share/qt4/examples/tools/styleplugin/stylewindow/stylewindow.h
share/qt4/examples/tools/styleplugin/stylewindow/stylewindow.pro
@@ -1642,7 +1642,7 @@ share/qt4/examples/tools/treemodelcompleter/mainwindow.h
share/qt4/examples/tools/treemodelcompleter/resources/treemodel.txt
share/qt4/examples/tools/treemodelcompleter/treemodelcompleter
share/qt4/examples/tools/treemodelcompleter/treemodelcompleter.cpp
-share/qt4/examples/tools/treemodelcompleter/treemodelcompleter.debug
+%%DEBUG%%share/qt4/examples/tools/treemodelcompleter/treemodelcompleter.debug
share/qt4/examples/tools/treemodelcompleter/treemodelcompleter.h
share/qt4/examples/tools/treemodelcompleter/treemodelcompleter.pro
share/qt4/examples/tools/treemodelcompleter/treemodelcompleter.qrc
@@ -1656,13 +1656,13 @@ share/qt4/examples/tools/undoframework/main.cpp
share/qt4/examples/tools/undoframework/mainwindow.cpp
share/qt4/examples/tools/undoframework/mainwindow.h
share/qt4/examples/tools/undoframework/undoframework
-share/qt4/examples/tools/undoframework/undoframework.debug
+%%DEBUG%%share/qt4/examples/tools/undoframework/undoframework.debug
share/qt4/examples/tools/undoframework/undoframework.pro
share/qt4/examples/tools/undoframework/undoframework.qrc
share/qt4/examples/tutorial/README
share/qt4/examples/tutorial/t1/main.cpp
share/qt4/examples/tutorial/t1/t1
-share/qt4/examples/tutorial/t1/t1.debug
+%%DEBUG%%share/qt4/examples/tutorial/t1/t1.debug
share/qt4/examples/tutorial/t1/t1.pro
share/qt4/examples/tutorial/t10/cannonfield.cpp
share/qt4/examples/tutorial/t10/cannonfield.h
@@ -1670,7 +1670,7 @@ share/qt4/examples/tutorial/t10/lcdrange.cpp
share/qt4/examples/tutorial/t10/lcdrange.h
share/qt4/examples/tutorial/t10/main.cpp
share/qt4/examples/tutorial/t10/t10
-share/qt4/examples/tutorial/t10/t10.debug
+%%DEBUG%%share/qt4/examples/tutorial/t10/t10.debug
share/qt4/examples/tutorial/t10/t10.pro
share/qt4/examples/tutorial/t11/cannonfield.cpp
share/qt4/examples/tutorial/t11/cannonfield.h
@@ -1678,7 +1678,7 @@ share/qt4/examples/tutorial/t11/lcdrange.cpp
share/qt4/examples/tutorial/t11/lcdrange.h
share/qt4/examples/tutorial/t11/main.cpp
share/qt4/examples/tutorial/t11/t11
-share/qt4/examples/tutorial/t11/t11.debug
+%%DEBUG%%share/qt4/examples/tutorial/t11/t11.debug
share/qt4/examples/tutorial/t11/t11.pro
share/qt4/examples/tutorial/t12/cannonfield.cpp
share/qt4/examples/tutorial/t12/cannonfield.h
@@ -1686,7 +1686,7 @@ share/qt4/examples/tutorial/t12/lcdrange.cpp
share/qt4/examples/tutorial/t12/lcdrange.h
share/qt4/examples/tutorial/t12/main.cpp
share/qt4/examples/tutorial/t12/t12
-share/qt4/examples/tutorial/t12/t12.debug
+%%DEBUG%%share/qt4/examples/tutorial/t12/t12.debug
share/qt4/examples/tutorial/t12/t12.pro
share/qt4/examples/tutorial/t13/cannonfield.cpp
share/qt4/examples/tutorial/t13/cannonfield.h
@@ -1696,7 +1696,7 @@ share/qt4/examples/tutorial/t13/lcdrange.cpp
share/qt4/examples/tutorial/t13/lcdrange.h
share/qt4/examples/tutorial/t13/main.cpp
share/qt4/examples/tutorial/t13/t13
-share/qt4/examples/tutorial/t13/t13.debug
+%%DEBUG%%share/qt4/examples/tutorial/t13/t13.debug
share/qt4/examples/tutorial/t13/t13.pro
share/qt4/examples/tutorial/t14/cannonfield.cpp
share/qt4/examples/tutorial/t14/cannonfield.h
@@ -1706,33 +1706,33 @@ share/qt4/examples/tutorial/t14/lcdrange.cpp
share/qt4/examples/tutorial/t14/lcdrange.h
share/qt4/examples/tutorial/t14/main.cpp
share/qt4/examples/tutorial/t14/t14
-share/qt4/examples/tutorial/t14/t14.debug
+%%DEBUG%%share/qt4/examples/tutorial/t14/t14.debug
share/qt4/examples/tutorial/t14/t14.pro
share/qt4/examples/tutorial/t2/main.cpp
share/qt4/examples/tutorial/t2/t2
-share/qt4/examples/tutorial/t2/t2.debug
+%%DEBUG%%share/qt4/examples/tutorial/t2/t2.debug
share/qt4/examples/tutorial/t2/t2.pro
share/qt4/examples/tutorial/t3/main.cpp
share/qt4/examples/tutorial/t3/t3
-share/qt4/examples/tutorial/t3/t3.debug
+%%DEBUG%%share/qt4/examples/tutorial/t3/t3.debug
share/qt4/examples/tutorial/t3/t3.pro
share/qt4/examples/tutorial/t4/main.cpp
share/qt4/examples/tutorial/t4/t4
-share/qt4/examples/tutorial/t4/t4.debug
+%%DEBUG%%share/qt4/examples/tutorial/t4/t4.debug
share/qt4/examples/tutorial/t4/t4.pro
share/qt4/examples/tutorial/t5/main.cpp
share/qt4/examples/tutorial/t5/t5
-share/qt4/examples/tutorial/t5/t5.debug
+%%DEBUG%%share/qt4/examples/tutorial/t5/t5.debug
share/qt4/examples/tutorial/t5/t5.pro
share/qt4/examples/tutorial/t6/main.cpp
share/qt4/examples/tutorial/t6/t6
-share/qt4/examples/tutorial/t6/t6.debug
+%%DEBUG%%share/qt4/examples/tutorial/t6/t6.debug
share/qt4/examples/tutorial/t6/t6.pro
share/qt4/examples/tutorial/t7/lcdrange.cpp
share/qt4/examples/tutorial/t7/lcdrange.h
share/qt4/examples/tutorial/t7/main.cpp
share/qt4/examples/tutorial/t7/t7
-share/qt4/examples/tutorial/t7/t7.debug
+%%DEBUG%%share/qt4/examples/tutorial/t7/t7.debug
share/qt4/examples/tutorial/t7/t7.pro
share/qt4/examples/tutorial/t8/cannonfield.cpp
share/qt4/examples/tutorial/t8/cannonfield.h
@@ -1740,7 +1740,7 @@ share/qt4/examples/tutorial/t8/lcdrange.cpp
share/qt4/examples/tutorial/t8/lcdrange.h
share/qt4/examples/tutorial/t8/main.cpp
share/qt4/examples/tutorial/t8/t8
-share/qt4/examples/tutorial/t8/t8.debug
+%%DEBUG%%share/qt4/examples/tutorial/t8/t8.debug
share/qt4/examples/tutorial/t8/t8.pro
share/qt4/examples/tutorial/t9/cannonfield.cpp
share/qt4/examples/tutorial/t9/cannonfield.h
@@ -1748,13 +1748,13 @@ share/qt4/examples/tutorial/t9/lcdrange.cpp
share/qt4/examples/tutorial/t9/lcdrange.h
share/qt4/examples/tutorial/t9/main.cpp
share/qt4/examples/tutorial/t9/t9
-share/qt4/examples/tutorial/t9/t9.debug
+%%DEBUG%%share/qt4/examples/tutorial/t9/t9.debug
share/qt4/examples/tutorial/t9/t9.pro
share/qt4/examples/tutorial/tutorial.pro
share/qt4/examples/widgets/README
share/qt4/examples/widgets/analogclock/analogclock
share/qt4/examples/widgets/analogclock/analogclock.cpp
-share/qt4/examples/widgets/analogclock/analogclock.debug
+%%DEBUG%%share/qt4/examples/widgets/analogclock/analogclock.debug
share/qt4/examples/widgets/analogclock/analogclock.h
share/qt4/examples/widgets/analogclock/analogclock.pro
share/qt4/examples/widgets/analogclock/main.cpp
@@ -1762,12 +1762,12 @@ share/qt4/examples/widgets/calculator/button.cpp
share/qt4/examples/widgets/calculator/button.h
share/qt4/examples/widgets/calculator/calculator
share/qt4/examples/widgets/calculator/calculator.cpp
-share/qt4/examples/widgets/calculator/calculator.debug
+%%DEBUG%%share/qt4/examples/widgets/calculator/calculator.debug
share/qt4/examples/widgets/calculator/calculator.h
share/qt4/examples/widgets/calculator/calculator.pro
share/qt4/examples/widgets/calculator/main.cpp
share/qt4/examples/widgets/charactermap/charactermap
-share/qt4/examples/widgets/charactermap/charactermap.debug
+%%DEBUG%%share/qt4/examples/widgets/charactermap/charactermap.debug
share/qt4/examples/widgets/charactermap/charactermap.pro
share/qt4/examples/widgets/charactermap/characterwidget.cpp
share/qt4/examples/widgets/charactermap/characterwidget.h
@@ -1776,12 +1776,12 @@ share/qt4/examples/widgets/charactermap/mainwindow.cpp
share/qt4/examples/widgets/charactermap/mainwindow.h
share/qt4/examples/widgets/digitalclock/digitalclock
share/qt4/examples/widgets/digitalclock/digitalclock.cpp
-share/qt4/examples/widgets/digitalclock/digitalclock.debug
+%%DEBUG%%share/qt4/examples/widgets/digitalclock/digitalclock.debug
share/qt4/examples/widgets/digitalclock/digitalclock.h
share/qt4/examples/widgets/digitalclock/digitalclock.pro
share/qt4/examples/widgets/digitalclock/main.cpp
share/qt4/examples/widgets/groupbox/groupbox
-share/qt4/examples/widgets/groupbox/groupbox.debug
+%%DEBUG%%share/qt4/examples/widgets/groupbox/groupbox.debug
share/qt4/examples/widgets/groupbox/groupbox.pro
share/qt4/examples/widgets/groupbox/main.cpp
share/qt4/examples/widgets/groupbox/window.cpp
@@ -1789,7 +1789,7 @@ share/qt4/examples/widgets/groupbox/window.h
share/qt4/examples/widgets/icons/iconpreviewarea.cpp
share/qt4/examples/widgets/icons/iconpreviewarea.h
share/qt4/examples/widgets/icons/icons
-share/qt4/examples/widgets/icons/icons.debug
+%%DEBUG%%share/qt4/examples/widgets/icons/icons.debug
share/qt4/examples/widgets/icons/icons.pro
share/qt4/examples/widgets/icons/iconsizespinbox.cpp
share/qt4/examples/widgets/icons/iconsizespinbox.h
@@ -1814,12 +1814,12 @@ share/qt4/examples/widgets/icons/mainwindow.cpp
share/qt4/examples/widgets/icons/mainwindow.h
share/qt4/examples/widgets/imageviewer/imageviewer
share/qt4/examples/widgets/imageviewer/imageviewer.cpp
-share/qt4/examples/widgets/imageviewer/imageviewer.debug
+%%DEBUG%%share/qt4/examples/widgets/imageviewer/imageviewer.debug
share/qt4/examples/widgets/imageviewer/imageviewer.h
share/qt4/examples/widgets/imageviewer/imageviewer.pro
share/qt4/examples/widgets/imageviewer/main.cpp
share/qt4/examples/widgets/lineedits/lineedits
-share/qt4/examples/widgets/lineedits/lineedits.debug
+%%DEBUG%%share/qt4/examples/widgets/lineedits/lineedits.debug
share/qt4/examples/widgets/lineedits/lineedits.pro
share/qt4/examples/widgets/lineedits/main.cpp
share/qt4/examples/widgets/lineedits/window.cpp
@@ -1831,7 +1831,7 @@ share/qt4/examples/widgets/movie/images/quit.png
share/qt4/examples/widgets/movie/images/stop.png
share/qt4/examples/widgets/movie/main.cpp
share/qt4/examples/widgets/movie/movie
-share/qt4/examples/widgets/movie/movie.debug
+%%DEBUG%%share/qt4/examples/widgets/movie/movie.debug
share/qt4/examples/widgets/movie/movie.pro
share/qt4/examples/widgets/movie/movie.qrc
share/qt4/examples/widgets/movie/movieplayer.cpp
@@ -1841,19 +1841,19 @@ share/qt4/examples/widgets/scribble/main.cpp
share/qt4/examples/widgets/scribble/mainwindow.cpp
share/qt4/examples/widgets/scribble/mainwindow.h
share/qt4/examples/widgets/scribble/scribble
-share/qt4/examples/widgets/scribble/scribble.debug
+%%DEBUG%%share/qt4/examples/widgets/scribble/scribble.debug
share/qt4/examples/widgets/scribble/scribble.pro
share/qt4/examples/widgets/scribble/scribblearea.cpp
share/qt4/examples/widgets/scribble/scribblearea.h
share/qt4/examples/widgets/shapedclock/main.cpp
share/qt4/examples/widgets/shapedclock/shapedclock
share/qt4/examples/widgets/shapedclock/shapedclock.cpp
-share/qt4/examples/widgets/shapedclock/shapedclock.debug
+%%DEBUG%%share/qt4/examples/widgets/shapedclock/shapedclock.debug
share/qt4/examples/widgets/shapedclock/shapedclock.h
share/qt4/examples/widgets/shapedclock/shapedclock.pro
share/qt4/examples/widgets/sliders/main.cpp
share/qt4/examples/widgets/sliders/sliders
-share/qt4/examples/widgets/sliders/sliders.debug
+%%DEBUG%%share/qt4/examples/widgets/sliders/sliders.debug
share/qt4/examples/widgets/sliders/sliders.pro
share/qt4/examples/widgets/sliders/slidersgroup.cpp
share/qt4/examples/widgets/sliders/slidersgroup.h
@@ -1861,7 +1861,7 @@ share/qt4/examples/widgets/sliders/window.cpp
share/qt4/examples/widgets/sliders/window.h
share/qt4/examples/widgets/spinboxes/main.cpp
share/qt4/examples/widgets/spinboxes/spinboxes
-share/qt4/examples/widgets/spinboxes/spinboxes.debug
+%%DEBUG%%share/qt4/examples/widgets/spinboxes/spinboxes.debug
share/qt4/examples/widgets/spinboxes/spinboxes.pro
share/qt4/examples/widgets/spinboxes/window.cpp
share/qt4/examples/widgets/spinboxes/window.h
@@ -1871,7 +1871,7 @@ share/qt4/examples/widgets/styles/main.cpp
share/qt4/examples/widgets/styles/norwegianwoodstyle.cpp
share/qt4/examples/widgets/styles/norwegianwoodstyle.h
share/qt4/examples/widgets/styles/styles
-share/qt4/examples/widgets/styles/styles.debug
+%%DEBUG%%share/qt4/examples/widgets/styles/styles.debug
share/qt4/examples/widgets/styles/styles.pro
share/qt4/examples/widgets/styles/styles.qrc
share/qt4/examples/widgets/styles/widgetgallery.cpp
@@ -1881,7 +1881,7 @@ share/qt4/examples/widgets/stylesheet/mainwindow.cpp
share/qt4/examples/widgets/stylesheet/mainwindow.h
share/qt4/examples/widgets/stylesheet/mainwindow.ui
share/qt4/examples/widgets/stylesheet/stylesheet
-share/qt4/examples/widgets/stylesheet/stylesheet.debug
+%%DEBUG%%share/qt4/examples/widgets/stylesheet/stylesheet.debug
share/qt4/examples/widgets/stylesheet/stylesheet.pro
share/qt4/examples/widgets/stylesheet/stylesheet.qrc
share/qt4/examples/widgets/stylesheet/stylesheeteditor.cpp
@@ -1891,7 +1891,7 @@ share/qt4/examples/widgets/tablet/main.cpp
share/qt4/examples/widgets/tablet/mainwindow.cpp
share/qt4/examples/widgets/tablet/mainwindow.h
share/qt4/examples/widgets/tablet/tablet
-share/qt4/examples/widgets/tablet/tablet.debug
+%%DEBUG%%share/qt4/examples/widgets/tablet/tablet.debug
share/qt4/examples/widgets/tablet/tablet.pro
share/qt4/examples/widgets/tablet/tabletapplication.cpp
share/qt4/examples/widgets/tablet/tabletapplication.h
@@ -1899,7 +1899,7 @@ share/qt4/examples/widgets/tablet/tabletcanvas.cpp
share/qt4/examples/widgets/tablet/tabletcanvas.h
share/qt4/examples/widgets/tetrix/main.cpp
share/qt4/examples/widgets/tetrix/tetrix
-share/qt4/examples/widgets/tetrix/tetrix.debug
+%%DEBUG%%share/qt4/examples/widgets/tetrix/tetrix.debug
share/qt4/examples/widgets/tetrix/tetrix.pro
share/qt4/examples/widgets/tetrix/tetrixboard.cpp
share/qt4/examples/widgets/tetrix/tetrixboard.h
@@ -1916,7 +1916,7 @@ share/qt4/examples/widgets/tooltips/shapeitem.h
share/qt4/examples/widgets/tooltips/sortingbox.cpp
share/qt4/examples/widgets/tooltips/sortingbox.h
share/qt4/examples/widgets/tooltips/tooltips
-share/qt4/examples/widgets/tooltips/tooltips.debug
+%%DEBUG%%share/qt4/examples/widgets/tooltips/tooltips.debug
share/qt4/examples/widgets/tooltips/tooltips.pro
share/qt4/examples/widgets/tooltips/tooltips.qrc
share/qt4/examples/widgets/widgets.pro
@@ -1924,7 +1924,7 @@ share/qt4/examples/widgets/wiggly/dialog.cpp
share/qt4/examples/widgets/wiggly/dialog.h
share/qt4/examples/widgets/wiggly/main.cpp
share/qt4/examples/widgets/wiggly/wiggly
-share/qt4/examples/widgets/wiggly/wiggly.debug
+%%DEBUG%%share/qt4/examples/widgets/wiggly/wiggly.debug
share/qt4/examples/widgets/wiggly/wiggly.pro
share/qt4/examples/widgets/wiggly/wigglywidget.cpp
share/qt4/examples/widgets/wiggly/wigglywidget.h
@@ -1934,11 +1934,11 @@ share/qt4/examples/widgets/windowflags/main.cpp
share/qt4/examples/widgets/windowflags/previewwindow.cpp
share/qt4/examples/widgets/windowflags/previewwindow.h
share/qt4/examples/widgets/windowflags/windowflags
-share/qt4/examples/widgets/windowflags/windowflags.debug
+%%DEBUG%%share/qt4/examples/widgets/windowflags/windowflags.debug
share/qt4/examples/widgets/windowflags/windowflags.pro
share/qt4/examples/xml/README
share/qt4/examples/xml/dombookmarks/dombookmarks
-share/qt4/examples/xml/dombookmarks/dombookmarks.debug
+%%DEBUG%%share/qt4/examples/xml/dombookmarks/dombookmarks.debug
share/qt4/examples/xml/dombookmarks/dombookmarks.pro
share/qt4/examples/xml/dombookmarks/frank.xbel
share/qt4/examples/xml/dombookmarks/jennifer.xbel
@@ -1950,7 +1950,7 @@ share/qt4/examples/xml/dombookmarks/xbeltree.h
share/qt4/examples/xml/rsslisting/main.cpp
share/qt4/examples/xml/rsslisting/rsslisting
share/qt4/examples/xml/rsslisting/rsslisting.cpp
-share/qt4/examples/xml/rsslisting/rsslisting.debug
+%%DEBUG%%share/qt4/examples/xml/rsslisting/rsslisting.debug
share/qt4/examples/xml/rsslisting/rsslisting.h
share/qt4/examples/xml/rsslisting/rsslisting.pro
share/qt4/examples/xml/saxbookmarks/frank.xbel
@@ -1959,7 +1959,7 @@ share/qt4/examples/xml/saxbookmarks/main.cpp
share/qt4/examples/xml/saxbookmarks/mainwindow.cpp
share/qt4/examples/xml/saxbookmarks/mainwindow.h
share/qt4/examples/xml/saxbookmarks/saxbookmarks
-share/qt4/examples/xml/saxbookmarks/saxbookmarks.debug
+%%DEBUG%%share/qt4/examples/xml/saxbookmarks/saxbookmarks.debug
share/qt4/examples/xml/saxbookmarks/saxbookmarks.pro
share/qt4/examples/xml/saxbookmarks/xbelgenerator.cpp
share/qt4/examples/xml/saxbookmarks/xbelgenerator.h
@@ -1971,7 +1971,7 @@ share/qt4/examples/xml/streambookmarks/main.cpp
share/qt4/examples/xml/streambookmarks/mainwindow.cpp
share/qt4/examples/xml/streambookmarks/mainwindow.h
share/qt4/examples/xml/streambookmarks/streambookmarks
-share/qt4/examples/xml/streambookmarks/streambookmarks.debug
+%%DEBUG%%share/qt4/examples/xml/streambookmarks/streambookmarks.debug
share/qt4/examples/xml/streambookmarks/streambookmarks.pro
share/qt4/examples/xml/streambookmarks/xbelreader.cpp
share/qt4/examples/xml/streambookmarks/xbelreader.h
@@ -1980,7 +1980,7 @@ share/qt4/examples/xml/streambookmarks/xbelwriter.h
share/qt4/examples/xml/xml.pro
share/qt4/examples/xml/xmlstreamlint/main.cpp
share/qt4/examples/xml/xmlstreamlint/xmlstreamlint
-share/qt4/examples/xml/xmlstreamlint/xmlstreamlint.debug
+%%DEBUG%%share/qt4/examples/xml/xmlstreamlint/xmlstreamlint.debug
share/qt4/examples/xml/xmlstreamlint/xmlstreamlint.pro
@dirrm share/qt4/examples/xml/xmlstreamlint
@dirrm share/qt4/examples/xml/streambookmarks
diff --git a/net/qt4-network/Makefile b/net/qt4-network/Makefile
index 6716b5e7e01d..a8e0894be7b7 100644
--- a/net/qt4-network/Makefile
+++ b/net/qt4-network/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt network library
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc rcc corelib
+QT_COMPONENTS= qmake_build moc_build rcc_build corelib
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -45,8 +45,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME}
CONFIGURE_WRKSRC=${WRKSRC}/../../
-.include <bsd.port.pre.mk>
-
pre-configure:
${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \
@@ -66,4 +64,4 @@ post-configure:
-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
${WRKSRC}/../../lib/pkgconfig/*Qt*
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/qt4-network/pkg-plist b/net/qt4-network/pkg-plist
index 73b29023804a..9e3301a4985e 100644
--- a/net/qt4-network/pkg-plist
+++ b/net/qt4-network/pkg-plist
@@ -65,6 +65,6 @@ lib/libQtNetwork.so
lib/libQtNetwork.so.4
lib/libQtNetwork.so.4.3
lib/libQtNetwork.so.4.3.0
-lib/libQtNetwork.so.4.3.0.debug
+%%DEBUG%%lib/libQtNetwork.so.4.3.0.debug
libdata/pkgconfig/QtNetwork.pc
@dirrm include/QtNetwork
diff --git a/textproc/qt4-xml/Makefile b/textproc/qt4-xml/Makefile
index 9aacf23f96c7..3c2fe41250ee 100644
--- a/textproc/qt4-xml/Makefile
+++ b/textproc/qt4-xml/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt XML library
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc corelib
+QT_COMPONENTS= qmake_build moc_build corelib
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -45,8 +45,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME}
CONFIGURE_WRKSRC=${WRKSRC}/../../
-.include <bsd.port.pre.mk>
-
pre-configure:
${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \
@@ -59,10 +57,10 @@ pre-configure:
post-configure:
${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
- -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${WRKSRC}/Makefile
+ -e 's|.*$$(QMAKE).*||g' ${WRKSRC}/Makefile
${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
${WRKSRC}/../../lib/pkgconfig/*Qt*
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/qt4-xml/pkg-plist b/textproc/qt4-xml/pkg-plist
index 1bdf9f64b59c..98401099712f 100644
--- a/textproc/qt4-xml/pkg-plist
+++ b/textproc/qt4-xml/pkg-plist
@@ -54,5 +54,6 @@ lib/libQtXml.so
lib/libQtXml.so.4
lib/libQtXml.so.4.3
lib/libQtXml.so.4.3.0
+%%DEBUG%%lib/libQtXml.so.4.3.0.debug
libdata/pkgconfig/QtXml.pc
@dirrm include/QtXml
diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index 9433e4b16a3e..6fabcecb590a 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -21,7 +21,7 @@ COMMENT= Qt graphical user interface library
LIB_DEPENDS?= png:${PORTSDIR}/graphics/png
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc rcc uic corelib
+QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -84,7 +84,7 @@ pre-configure:
post-configure:
${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
- -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${WRKSRC}/Makefile
+ -e 's|.*$$(QMAKE).*||g' ${WRKSRC}/Makefile
${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
diff --git a/x11-toolkits/qt4-gui/pkg-plist b/x11-toolkits/qt4-gui/pkg-plist
index 1189b2335021..b7c9df0cdb55 100644
--- a/x11-toolkits/qt4-gui/pkg-plist
+++ b/x11-toolkits/qt4-gui/pkg-plist
@@ -740,5 +740,6 @@ lib/libQtGui.so
lib/libQtGui.so.4
lib/libQtGui.so.4.3
lib/libQtGui.so.4.3.0
+%%DEBUG%%lib/libQtGui.so.4.3.0.debug
libdata/pkgconfig/QtGui.pc
@dirrm include/QtGui
diff --git a/x11/qt4-inputmethods/Makefile b/x11/qt4-inputmethods/Makefile
index f836361f37bb..c9b569ce84ad 100644
--- a/x11/qt4-inputmethods/Makefile
+++ b/x11/qt4-inputmethods/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt input method plugins
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc corelib gui
+QT_COMPONENTS= qmake_build moc_build corelib gui
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -43,8 +43,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
WRKSRC= ${WRKDIR}/${DISTNAME}/src/plugins/${PORTNAME}
CONFIGURE_WRKSRC=${WRKSRC}/../../..
-.include <bsd.port.pre.mk>
-
pre-configure:
${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib/plugins/inputmethods|g' \
@@ -53,4 +51,4 @@ pre-configure:
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../bin/qmake
${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../../bin/moc
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/qt4-inputmethods/pkg-plist b/x11/qt4-inputmethods/pkg-plist
index a74e769e120c..b3ac7fe02e28 100644
--- a/x11/qt4-inputmethods/pkg-plist
+++ b/x11/qt4-inputmethods/pkg-plist
@@ -1,3 +1,3 @@
lib/plugins/inputmethods/libqimsw-multi.so
-lib/plugins/inputmethods/libqimsw-multi.so.debug
+%%DEBUG%%lib/plugins/inputmethods/libqimsw-multi.so.debug
@dirrm lib/plugins/inputmethods
diff --git a/x11/qt4-opengl/Makefile b/x11/qt4-opengl/Makefile
index 5bbe7cf165d8..06fc7a9437a2 100644
--- a/x11/qt4-opengl/Makefile
+++ b/x11/qt4-opengl/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt OpenGL library
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc corelib gui
+QT_COMPONENTS= qmake_build moc_build corelib gui
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -47,8 +47,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME}
CONFIGURE_WRKSRC=${WRKSRC}/../../
-.include <bsd.port.pre.mk>
-
pre-configure:
${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \
@@ -67,4 +65,4 @@ post-configure:
-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
${WRKSRC}/../../lib/pkgconfig/*Qt*
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/qt4-opengl/pkg-plist b/x11/qt4-opengl/pkg-plist
index 876fccd7e413..7c246915cae5 100644
--- a/x11/qt4-opengl/pkg-plist
+++ b/x11/qt4-opengl/pkg-plist
@@ -20,6 +20,6 @@ lib/libQtOpenGL.so
lib/libQtOpenGL.so.4
lib/libQtOpenGL.so.4.3
lib/libQtOpenGL.so.4.3.0
-lib/libQtOpenGL.so.4.3.0.debug
+%%DEBUG%%lib/libQtOpenGL.so.4.3.0.debug
libdata/pkgconfig/QtOpenGL.pc
@dirrm include/QtOpenGL