4 files changed, 8 insertions, 33 deletions

diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile
index e9810123b3fa..14d5663aac5a 100644
--- a/devel/qt4-designer/Makefile
+++ b/devel/qt4-designer/Makefile
@@ -59,6 +59,7 @@ post-configure:
 	${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
 			-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
 			-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
+			-E -e 's|(.*Cflags:.*)-I${LOCALBASE}/include |\1|g' \
 		${WRKSRC}/../../lib/pkgconfig/*Qt*
 
 .include <bsd.port.mk>
diff --git a/devel/qt4-designer/distinfo b/devel/qt4-designer/distinfo
index 8fbd772f627d..9451a68b5c02 100644
--- a/devel/qt4-designer/distinfo
+++ b/devel/qt4-designer/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13
-SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661
-SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858
+MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93
+SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2
+SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710
diff --git a/devel/qt4-designer/files/patch-0185-fix-format-strings.diff b/devel/qt4-designer/files/patch-0185-fix-format-strings.diff
deleted file mode 100644
index 289563024d18..000000000000
--- a/devel/qt4-designer/files/patch-0185-fix-format-strings.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- tools/designer/src/lib/uilib/formbuilderextra.cpp
-+++ tools/designer/src/lib/uilib/formbuilderextra.cpp
-@@ -33,9 +33,7 @@ namespace QFormInternal {
- #endif
-
- void uiLibWarning(const QString &message) {
--    QString prefixedMessage = QLatin1String("Designer: ");
--    prefixedMessage += message;
--    qWarning(prefixedMessage.toUtf8().constData());
-+    qWarning("Designer: %s", qPrintable(message));
- }
-
- QFormBuilderExtra::QFormBuilderExtra() :
---- tools/designer/src/lib/shared/qdesigner_utils.cpp
-+++ tools/designer/src/lib/shared/qdesigner_utils.cpp
-@@ -40,9 +40,7 @@ namespace qdesigner_internal
- {
-     QDESIGNER_SHARED_EXPORT void designerWarning(const QString &message)
-     {
--        QString prefixedMessage = QLatin1String("Designer: ");
--        prefixedMessage += message;
--        qWarning(prefixedMessage.toUtf8().constData());
-+        qWarning("Designer: %s", qPrintable(message));
-     }
-
-     QString EnumType::id() const
\ No newline at end of file
diff --git a/devel/qt4-designer/pkg-plist b/devel/qt4-designer/pkg-plist
index e96b50de47e9..217ea3a8f926 100644
--- a/devel/qt4-designer/pkg-plist
+++ b/devel/qt4-designer/pkg-plist
@@ -86,14 +86,14 @@ lib/libQtDesigner.prl
 lib/libQtDesigner.so
 lib/libQtDesigner.so.4
 lib/libQtDesigner.so.4.3
-lib/libQtDesigner.so.4.3.1
-%%DEBUG%%lib/libQtDesigner.so.4.3.1.debug
+lib/libQtDesigner.so.4.3.4
+%%DEBUG%%lib/libQtDesigner.so.4.3.4.debug
 lib/libQtDesignerComponents.prl
 lib/libQtDesignerComponents.so
 lib/libQtDesignerComponents.so.4
 lib/libQtDesignerComponents.so.4.3
-lib/libQtDesignerComponents.so.4.3.1
-%%DEBUG%%lib/libQtDesignerComponents.so.4.3.1.debug
+lib/libQtDesignerComponents.so.4.3.4
+%%DEBUG%%lib/libQtDesignerComponents.so.4.3.4.debug
 lib/libQtUiTools.a
 lib/libQtUiTools.prl
 lib/qt4/plugins/designer/libqt3supportwidgets.so