<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[138653] trunk/dports/aqua/qt4-mac/files/patch-cxx11.diff</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/138653">138653</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-07-14 11:11:56 -0700 (Tue, 14 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>qt4-mac: fix cxx11 patch for 4.8.7.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqt4macfilespatchcxx11diff">trunk/dports/aqua/qt4-mac/files/patch-cxx11.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquaqt4macfilespatchcxx11diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/qt4-mac/files/patch-cxx11.diff (138652 => 138653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt4-mac/files/patch-cxx11.diff 2015-07-14 17:55:50 UTC (rev 138652)
+++ trunk/dports/aqua/qt4-mac/files/patch-cxx11.diff 2015-07-14 18:11:56 UTC (rev 138653)
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> class QAInterface;
</span><span class="cx"> --- src/gui/styles/qmacstyle_mac.mm.orig 2013-01-22 19:50:08.000000000 -0500
</span><span class="cx"> +++ src/gui/styles/qmacstyle_mac.mm 2013-01-22 19:55:50.000000000 -0500
</span><del>-@@ -3468,8 +3468,8 @@
</del><ins>+@@ -3466,8 +3466,8 @@
</ins><span class="cx"> tti.version = qt_mac_hitheme_version;
</span><span class="cx"> tti.state = tds;
</span><span class="cx"> QColor textColor = btn->palette.buttonText().color();
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> CGContextSetFillColorSpace(cg, QCoreGraphicsPaintEngine::macGenericColorSpace());
</span><span class="cx"> CGContextSetFillColor(cg, colorComp);
</span><span class="cx"> tti.fontID = themeId;
</span><del>-@@ -3701,8 +3701,8 @@
</del><ins>+@@ -3708,8 +3708,8 @@
</ins><span class="cx"> tti.version = qt_mac_hitheme_version;
</span><span class="cx"> tti.state = tds;
</span><span class="cx"> QColor textColor = myTab.palette.windowText().color();
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> CGContextSetFillColorSpace(cg, QCoreGraphicsPaintEngine::macGenericColorSpace());
</span><span class="cx"> CGContextSetFillColor(cg, colorComp);
</span><span class="cx"> switch (d->aquaSizeConstrain(opt, w)) {
</span><del>-@@ -3882,8 +3882,8 @@
</del><ins>+@@ -3898,8 +3898,8 @@
</ins><span class="cx"> CGContextSetShouldAntialias(cg, true);
</span><span class="cx"> CGContextSetShouldSmoothFonts(cg, true);
</span><span class="cx"> QColor textColor = p->pen().color();
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> CGContextSetFillColorSpace(cg, QCoreGraphicsPaintEngine::macGenericColorSpace());
</span><span class="cx"> CGContextSetFillColor(cg, colorComp);
</span><span class="cx"> HIThemeTextInfo tti;
</span><del>-@@ -5018,8 +5018,8 @@
</del><ins>+@@ -5034,8 +5034,8 @@
</ins><span class="cx"> tti.version = qt_mac_hitheme_version;
</span><span class="cx"> tti.state = tds;
</span><span class="cx"> QColor textColor = groupBox->palette.windowText().color();
</span><span class="lines">@@ -592,25 +592,3 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>---- tools/designer/src/lib/shared/previewmanager.cpp.orig 2014-05-01 12:33:00.000000000 -0400
-+++ tools/designer/src/lib/shared/previewmanager.cpp 2014-05-01 12:33:16.000000000 -0400
-@@ -817,7 +817,7 @@
- {
- typedef PreviewManagerPrivate::PreviewDataList PreviewDataList;
- if (d->m_previews.empty())
-- return false;
-+ return 0;
-
- // find matching window
- const PreviewDataList::const_iterator cend = d->m_previews.constEnd();
---- src/scripttools/debugging/qscriptdebuggerconsole.cpp.orig 2014-05-01 13:47:57.000000000 -0400
-+++ src/scripttools/debugging/qscriptdebuggerconsole.cpp 2014-05-01 13:48:11.000000000 -0400
-@@ -489,7 +489,7 @@
- d->input += QLatin1Char('\n');
- QScriptSyntaxCheckResult check = QScriptEngine::checkSyntax(d->input);
- if (check.state() == QScriptSyntaxCheckResult::Intermediate)
-- return false;
-+ return 0;
- d->input.chop(1); // remove the last \n
- cmd = QString();
- cmd.append(d->commandPrefix);
</del></span></pre>
</div>
</div>
</body>
</html>