head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.1.0.12
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.10
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.8
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.6
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.4
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.2
	pkgsrc-2012Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2013.07.07.18.13.56;	author adam;	state dead;
branches;
next	1.1;
commitid	fnM5tvxHjOL3czWw;

1.1
date	2012.02.27.12.41.22;	author reinoud;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Qt 4.8.5 provides overall close to 400 improvements, for example:
35 fixes to Qt Core module
65 fixes to Qt Gui module
21 Mac OS X specific fixes
15 Windows specific fixes
8 Linux/X11 specific fixes
Webkit upgrade to 2.2.4 (minor improvements)
Change all shmget calls to user-only memory (security)
Several important fixes for the VxWorks port in the Qt Enterprise version
@
text
@$NetBSD: patch-src-tools-mocmain.cpp-QTBUG-22829,v 1.1 2012/02/27 12:41:22 reinoud Exp $

--- src/tools/moc/main.cpp.orig	2011-12-08 05:06:03.000000000 +0000
+++ src/tools/moc/main.cpp
@@@@ -187,6 +187,8 @@@@ int runMoc(int _argc, char **_argv)
     Moc moc;
     pp.macros["Q_MOC_RUN"];
     pp.macros["__cplusplus"];
+    // rh#756395, https://bugreports.qt-project.org/browse/QTBUG-22829
+    pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
     QByteArray filename;
     QByteArray output;
     FILE *in = 0;
@


1.1
log
@Add patch to QT4's moc to fix QTBUG-22829
@
text
@d1 1
a1 1
$NetBSD$
@