<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c36944b24b03e118565e741d21d6dbe8bc6d6222">https://github.com/macports/macports-ports/commit/c36944b24b03e118565e741d21d6dbe8bc6d6222</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c36944b qt4-mac: cleanup / remove unnecessary info from current patches
</span>c36944b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c36944b24b03e118565e741d21d6dbe8bc6d6222
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Feb 28 18:05:52 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt4-mac: cleanup / remove unnecessary info from current patches
</span>---
aqua/qt4-mac/files/patch-QtHelp_10.4_only.diff | 20 ++---
.../patch-better-invalid-fonttable-handling.diff | 72 ++++++++---------
.../patch-config.tests_unix_compile.test.diff | 4 +-
.../patch-config.tests_unix_precomp.test.diff | 4 +-
aqua/qt4-mac/files/patch-configure.diff | 4 +-
aqua/qt4-mac/files/patch-cxx11.diff | 92 +++++++++++-----------
aqua/qt4-mac/files/patch-darwin-g++.diff | 4 +-
.../files/patch-mkspecs_common_g++-base.conf.diff | 4 +-
.../files/patch-mkspecs_common_g++-macx.conf.diff | 4 +-
.../files/patch-mkspecs_common_mac.conf.diff | 4 +-
.../files/patch-mkspecs_darwin-g++_qmake.conf.diff | 4 +-
.../files/patch-mkspecs_features_moc.prf.diff | 4 +-
.../files/patch-mkspecs_features_qt.prf.diff | 4 +-
.../patch-mkspecs_features_qt_functions.prf.diff | 4 +-
.../files/patch-mkspecs_features_uitools.prf.diff | 4 +-
.../files/patch-mkspecs_macx-g++_qmake.conf.diff | 4 +-
.../qt4-mac/files/patch-mkspecs_objective_cxx.diff | 52 ++++++------
aqua/qt4-mac/files/patch-qmake_option.h.diff | 4 +-
aqua/qt4-mac/files/patch-qmake_project.cpp.diff | 4 +-
aqua/qt4-mac/files/patch-qmake_property.cpp.diff | 4 +-
aqua/qt4-mac/files/patch-qmake_qmake.pri.diff | 4 +-
...webkit_Source_WebCore_plugins_PluginView.h.diff | 4 +-
...ource_WebCore_plugins_mac_PluginViewMac.mm.diff | 4 +-
.../files/patch-src_corelib_corelib.pro.diff | 4 +-
.../patch-src_corelib_global_qlibraryinfo.cpp.diff | 4 +-
.../patch-src_corelib_global_qlibraryinfo.h.diff | 4 +-
.../patch-src_corelib_io_qprocess_unix.cpp.diff | 4 +-
...ch-src_corelib_tools_qelapsedtimer-mac.cpp.diff | 4 +-
.../patch-src_gui_dialogs_qfiledialog_mac.mm.diff | 4 +-
.../files/patch-src_gui_kernel_qmime_mac.cpp.diff | 4 +-
.../patch-src_gui_painting_qpaintengine_mac.diff | 10 +--
aqua/qt4-mac/files/patch-src_qbase.pri.diff | 4 +-
aqua/qt4-mac/files/patch-src_qt_install.pri.diff | 4 +-
.../patch-src_tools_bootstrap_bootstrap.pro.diff | 4 +-
...tant_lib_fulltextsearch_fulltextsearch.pro.diff | 4 +-
.../files/patch-tools_assistant_lib_lib.pro.diff | 4 +-
...-tools_designer_src_components_lib_lib.pro.diff | 4 +-
.../patch-tools_designer_src_lib_lib.pro.diff | 4 +-
...tch-tools_designer_src_uitools_uitools.pro.diff | 4 +-
...tch-tools_macdeployqt_macdeployqt_main.cpp.diff | 4 +-
.../patch-tools_macdeployqt_shared_shared.cpp.diff | 4 +-
41 files changed, 195 insertions(+), 195 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-QtHelp_10.4_only.diff b/aqua/qt4-mac/files/patch-QtHelp_10.4_only.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0725e11..cfe49a0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-QtHelp_10.4_only.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-QtHelp_10.4_only.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/assistant/tools/assistant/assistant.pro.orig 2011-01-10 09:05:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/assistant/tools/assistant/assistant.pro 2011-01-10 09:05:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/assistant/tools/assistant/assistant.pro.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/assistant/tools/assistant/assistant.pro
</span> @@ -120,3 +120,30 @@
DEFINES += USE_STATIC_SQLITE_PLUGIN
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,8 +31,8 @@
</span> +
+
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro.orig 2011-01-10 09:05:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro 2011-01-10 09:05:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
</span> @@ -19,3 +19,27 @@
../shared/collectionconfiguration.cpp
HEADERS += ../shared/helpgenerator.h \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,8 +61,8 @@
</span> +}
+linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcwebkit
+LIBS_PRIVATE += -l$$qcwebkit
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/assistant/tools/qhelpconverter/qhelpconverter.pro.orig 2011-01-10 09:05:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/assistant/tools/qhelpconverter/qhelpconverter.pro 2011-01-10 09:05:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/assistant/tools/qhelpconverter/qhelpconverter.pro.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/assistant/tools/qhelpconverter/qhelpconverter.pro
</span> @@ -49,3 +49,27 @@
outputpage.ui
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,8 +91,8 @@
</span> +}
+linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcwebkit
+LIBS_PRIVATE += -l$$qcwebkit
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro.orig 2011-01-10 09:05:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro 2011-01-10 09:05:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro
</span> @@ -17,3 +17,27 @@
main.cpp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,8 +121,8 @@
</span> +}
+linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcwebkit
+LIBS_PRIVATE += -l$$qcwebkit
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/designer/src/plugins/qwebview/qwebview.pro.orig 2011-01-10 09:05:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/designer/src/plugins/qwebview/qwebview.pro 2011-01-10 09:05:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/designer/src/plugins/qwebview/qwebview.pro.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/designer/src/plugins/qwebview/qwebview.pro
</span> @@ -13,3 +13,19 @@
SOURCES += qwebview_plugin.cpp
HEADERS += qwebview_plugin.h
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-better-invalid-fonttable-handling.diff b/aqua/qt4-mac/files/patch-better-invalid-fonttable-handling.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1990f36..23d7b2f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-better-invalid-fonttable-handling.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-better-invalid-fonttable-handling.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/gui/text/qfontengine.cpp.orig
+++ src/gui/text/qfontengine.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -69,6 +69,16 @@ static inline bool qtransform_equals_no_translate(const QTransform &a, const QTr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,6 +69,16 @@
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@
</span> // Harfbuzz helper functions
static HB_Bool hb_stringToGlyphs(HB_Font font, const HB_UChar16 *string, hb_uint32 length, HB_Glyph *glyphs, hb_uint32 *numGlyphs, HB_Bool rightToLeft)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -808,26 +818,38 @@ void QFontEngine::loadKerningPairs(QFixed scalingFactor)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -808,26 +818,38 @@
</span> return;
const uchar *table = reinterpret_cast<const uchar *>(tab.constData());
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,7 +65,7 @@
</span> // qDebug("subtable: version=%d, coverage=%x",version, coverage);
if(version == 0 && coverage == 0x0001) {
if (offset + length > tab.size()) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -836,7 +858,10 @@ void QFontEngine::loadKerningPairs(QFixed scalingFactor)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -836,7 +858,10 @@
</span> }
const uchar *data = table + offset + 6;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +77,7 @@
</span> if(nPairs * 6 + 8 > length - 6) {
// qDebug("corrupt table!");
// corrupt table
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -846,8 +871,21 @@ void QFontEngine::loadKerningPairs(QFixed scalingFactor)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -846,8 +871,21 @@
</span> int off = 8;
for(int i = 0; i < nPairs; ++i) {
QFontEngine::KernPair p;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,7 +101,7 @@
</span> kerning_pairs.append(p);
off += 6;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -872,26 +910,31 @@ int QFontEngine::glyphCount() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -872,26 +910,31 @@
</span> QByteArray maxpTable = getSfntTable(MAKE_TAG('m', 'a', 'x', 'p'));
if (maxpTable.size() < 6)
return 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,7 +141,7 @@
</span> enum {
Invalid,
AppleRoman,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -906,8 +949,14 @@ const uchar *QFontEngine::getCMap(const uchar *table, uint tableSize, bool *isSy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -906,8 +949,14 @@
</span> int tableToUse = -1;
int score = Invalid;
for (int n = 0; n < numTables; ++n) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,7 +158,7 @@
</span> switch (platformId) {
case 0: // Unicode
if (score < Unicode &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -961,20 +1010,30 @@ const uchar *QFontEngine::getCMap(const uchar *table, uint tableSize, bool *isSy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -961,20 +1010,30 @@
</span> resolveTable:
*isSymbolFont = (symbolTable > -1);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -197,7 +197,7 @@
</span>
if (table + unicode_table + length > endPtr)
return 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -989,7 +1048,7 @@ resolveTable:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -989,7 +1048,7 @@
</span> // Check that none of the latin1 range are in the unicode table
bool unicodeTableHasLatin1 = false;
for (int uc=0x00; uc<0x100; ++uc) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -206,7 +206,7 @@
</span> unicodeTableHasLatin1 = true;
break;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -999,7 +1058,7 @@ resolveTable:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -999,7 +1058,7 @@
</span> bool unicodeTableHasSymbols = false;
if (!unicodeTableHasLatin1) {
for (int uc=0xf000; uc<0xf100; ++uc) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -215,7 +215,7 @@
</span> unicodeTableHasSymbols = true;
break;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1017,12 +1076,17 @@ resolveTable:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1017,12 +1076,17 @@
</span> return table + unicode_table;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -237,7 +237,7 @@
</span> } else if (format == 4) {
/* some fonts come with invalid cmap tables, where the last segment
specified end = start = rangeoffset = 0xffff, delta = 0x0001
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1031,25 +1095,49 @@ quint32 QFontEngine::getTrueTypeGlyphIndex(const uchar *cmap, uint unicode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1031,25 +1095,49 @@
</span> */
if(unicode >= 0xffff)
return 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -293,7 +293,7 @@
</span> if (id)
glyphIndex = (idDelta + id) % 0x10000;
else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1059,13 +1147,19 @@ quint32 QFontEngine::getTrueTypeGlyphIndex(const uchar *cmap, uint unicode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1059,13 +1147,19 @@
</span> }
return glyphIndex;
} else if (format == 6) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -316,7 +316,7 @@
</span> if (entryCount6 * 2 + 10 > tableSize)
return 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1074,9 +1168,14 @@ quint32 QFontEngine::getTrueTypeGlyphIndex(const uchar *cmap, uint unicode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1074,9 +1168,14 @@
</span> return 0;
quint16 entryIndex6 = unicode - firstCode6;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -333,7 +333,7 @@
</span>
cmap += 16; // move to start of groups
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1084,13 +1183,24 @@ quint32 QFontEngine::getTrueTypeGlyphIndex(const uchar *cmap, uint unicode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1084,13 +1183,24 @@
</span> while (left <= right) {
int middle = left + ( ( right - left ) >> 1 );
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -364,7 +364,7 @@
</span> }
--- src/gui/text/qfontengine_mac.mm.orig
+++ src/gui/text/qfontengine_mac.mm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -625,7 +625,7 @@ bool QFontEngineMacMulti::canRender(const QChar *string, int len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -625,7 +625,7 @@
</span> }
QFontEngineMac::QFontEngineMac(ATSUStyle baseStyle, ATSUFontID fontID, const QFontDef &def, QFontEngineMacMulti *multiEngine)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -373,7 +373,7 @@
</span> {
fontDef = def;
ATSUCreateAndCopyStyle(baseStyle, &style);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -747,22 +747,21 @@ bool QFontEngineMac::stringToCMap(const QChar *str, int len, QGlyphLayout *glyph
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -747,22 +747,21 @@
</span> {
if (!cmap) {
cmapTable = getSfntTable(MAKE_TAG('c', 'm', 'a', 'p'));
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -402,7 +402,7 @@
</span>
--- src/gui/text/qfontengine_mac_p.h.orig
+++ src/gui/text/qfontengine_mac_p.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,6 +108,7 @@ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,6 +108,7 @@
</span> qreal m_maxCharWidth;
QFixed m_xHeight;
QFixed m_averageCharWidth;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -412,7 +412,7 @@
</span> class QFontEngineMacMulti : public QFontEngineMulti
--- src/gui/text/qfontengine_p.h.orig
+++ src/gui/text/qfontengine_p.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -247,7 +247,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -247,7 +247,7 @@
</span> QFontEngineGlyphCache *glyphCache(void *key, QFontEngineGlyphCache::Type type, const QTransform &transform) const;
static const uchar *getCMap(const uchar *table, uint tableSize, bool *isSymbolFont, int *cmapSize);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -423,7 +423,7 @@
</span>
--- src/gui/text/qfontengine_qpa.cpp.orig
+++ src/gui/text/qfontengine_qpa.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -358,9 +358,9 @@ bool QFontEngineQPA::stringToCMap(const QChar *str, int len, QGlyphLayout *glyph
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -358,9 +358,9 @@
</span> unsigned int uc = getChar(str, i, len);
if (mirrored)
uc = QChar::mirroredChar(uc);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -435,7 +435,7 @@
</span> ++glyph_pos;
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -368,7 +368,7 @@ bool QFontEngineQPA::stringToCMap(const QChar *str, int len, QGlyphLayout *glyph
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -368,7 +368,7 @@
</span> unsigned int uc = getChar(str, i, len);
if (mirrored)
uc = QChar::mirroredChar(uc);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -444,7 +444,7 @@
</span> #if 0 && defined(DEBUG_FONTENGINE)
QChar c(uc);
if (!findGlyph(glyphs[glyph_pos].glyph) && !seenGlyphs.contains(c))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -511,16 +511,16 @@ bool QFontEngineQPA::canRender(const QChar *string, int len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -511,16 +511,16 @@
</span> if (symbol) {
for (int i = 0; i < len; ++i) {
unsigned int uc = getChar(string, i, len);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -466,7 +466,7 @@
</span> }
--- src/gui/text/qfontengine_qpf.cpp.orig
+++ src/gui/text/qfontengine_qpf.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -577,9 +577,9 @@ bool QFontEngineQPF::stringToCMap(const QChar *str, int len, QGlyphLayout *glyph
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -577,9 +577,9 @@
</span> if (symbol) {
for (int i = 0; i < len; ++i) {
unsigned int uc = getChar(str, i, len);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -478,7 +478,7 @@
</span> ++glyph_pos;
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -587,7 +587,7 @@ bool QFontEngineQPF::stringToCMap(const QChar *str, int len, QGlyphLayout *glyph
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -587,7 +587,7 @@
</span> unsigned int uc = getChar(str, i, len);
if (mirrored)
uc = QChar::mirroredChar(uc);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -487,7 +487,7 @@
</span> #if 0 && defined(DEBUG_FONTENGINE)
QChar c(uc);
if (!findGlyph(glyphs[glyph_pos].glyph) && !seenGlyphs.contains(c))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -786,16 +786,16 @@ bool QFontEngineQPF::canRender(const QChar *string, int len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -786,16 +786,16 @@
</span> if (symbol) {
for (int i = 0; i < len; ++i) {
unsigned int uc = getChar(string, i, len);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -509,7 +509,7 @@
</span> }
--- src/gui/text/qfontengine_s60.cpp.orig
+++ src/gui/text/qfontengine_s60.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -77,6 +77,7 @@ QSymbianTypeFaceExtras::QSymbianTypeFaceExtras(CFont* cFont, COpenFont *openFont
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,6 +77,7 @@
</span> : m_cFont(cFont)
, m_symbolCMap(false)
, m_openFont(openFont)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -517,7 +517,7 @@
</span> {
if (!symbianFontTableApiAvailable()) {
TAny *trueTypeExtension = NULL;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -161,10 +162,9 @@ const uchar *QSymbianTypeFaceExtras::cmap() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -161,10 +162,9 @@
</span> {
if (m_cmapTable.isNull()) {
const QByteArray cmapTable = getSfntTable(MAKE_TAG('c', 'm', 'a', 'p'));
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -530,7 +530,7 @@
</span> }
return reinterpret_cast<const uchar *>(m_cmapTable.constData());
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -324,6 +324,7 @@ bool QFontEngineS60::stringToCMap(const QChar *characters, int len, QGlyphLayout
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -324,6 +324,7 @@
</span> for (int i = 0; i < len; ++i) {
const unsigned int uc = getChar(characters, i, len);
*g++ = QFontEngine::getTrueTypeGlyphIndex(cmap,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -538,7 +538,7 @@
</span> (isRtl && !m_extras->isSymbolCMap()) ? QChar::mirroredChar(uc) : uc);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -463,7 +464,7 @@ bool QFontEngineS60::canRender(const QChar *string, int len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -463,7 +464,7 @@
</span> const unsigned char *cmap = m_extras->cmap();
for (int i = 0; i < len; ++i) {
const unsigned int uc = getChar(string, i, len);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -549,7 +549,7 @@
</span> return true;
--- src/gui/text/qfontengine_s60_p.h.orig
+++ src/gui/text/qfontengine_s60_p.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -93,6 +93,7 @@ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,6 +93,7 @@
</span> // the Font Table API
COpenFont *m_openFont;
mutable MOpenFontTrueTypeExtension *m_trueTypeExtension;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -559,7 +559,7 @@
</span> class QFontEngineS60 : public QFontEngine
--- src/gui/text/qfontengine_win.cpp.orig
+++ src/gui/text/qfontengine_win.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -215,9 +215,8 @@ void QFontEngineWin::getCMap()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -215,9 +215,8 @@
</span> bool symb = false;
if (ttf) {
cmapTable = getSfntTable(qbswap<quint32>(MAKE_TAG('c', 'm', 'a', 'p')));
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -570,7 +570,7 @@
</span> }
if (!cmap) {
ttf = false;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -263,14 +262,14 @@ int QFontEngineWin::getGlyphIndexes(const QChar *str, int numChars, QGlyphLayout
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -263,14 +262,14 @@
</span> if (symbol) {
for (; i < numChars; ++i, ++glyph_pos) {
unsigned int uc = getChar(str, i, numChars);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -588,7 +588,7 @@
</span> }
} else {
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -296,14 +295,14 @@ int QFontEngineWin::getGlyphIndexes(const QChar *str, int numChars, QGlyphLayout
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -296,14 +295,14 @@
</span> if (symbol) {
for (; i < numChars; ++i, ++glyph_pos) {
unsigned int uc = getChar(str, i, numChars);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -606,7 +606,7 @@
</span> }
} else {
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -335,6 +334,7 @@ QFontEngineWin::QFontEngineWin(const QString &name, HFONT _hfont, bool stockFont
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -335,6 +334,7 @@
</span> _name = name;
cmap = 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -614,7 +614,7 @@
</span> hfont = _hfont;
logfont = lf;
HDC hdc = shared_dc();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -811,9 +811,9 @@ bool QFontEngineWin::canRender(const QChar *string, int len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -811,9 +811,9 @@
</span> if (symbol) {
for (int i = 0; i < len; ++i) {
unsigned int uc = getChar(string, i, len);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -626,7 +626,7 @@
</span> return false;
} else {
return false;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -823,7 +823,7 @@ bool QFontEngineWin::canRender(const QChar *string, int len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -823,7 +823,7 @@
</span> } else if (ttf) {
for (int i = 0; i < len; ++i) {
unsigned int uc = getChar(string, i, len);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -637,7 +637,7 @@
</span> } else {
--- src/gui/text/qfontengine_win_p.h.orig
+++ src/gui/text/qfontengine_win_p.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -144,6 +144,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -144,6 +144,7 @@
</span> mutable uint widthCacheSize;
mutable QFixed *designAdvances;
mutable int designAdvancesSize;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-config.tests_unix_compile.test.diff b/aqua/qt4-mac/files/patch-config.tests_unix_compile.test.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index cce49b1..dd26f83 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-config.tests_unix_compile.test.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-config.tests_unix_compile.test.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.tests/unix/compile.test.orig 2013-07-06 14:39:26.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.tests/unix/compile.test 2013-07-06 14:39:44.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.tests/unix/compile.test.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.tests/unix/compile.test
</span> @@ -73,7 +73,7 @@
rm -f "$EXE" "${EXE}.exe"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-config.tests_unix_precomp.test.diff b/aqua/qt4-mac/files/patch-config.tests_unix_precomp.test.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d4ec6b0..c0672c5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-config.tests_unix_precomp.test.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-config.tests_unix_precomp.test.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.tests/unix/precomp.test.orig 2012-04-23 14:49:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.tests/unix/precomp.test 2012-04-17 14:38:16.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.tests/unix/precomp.test.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.tests/unix/precomp.test
</span> @@ -4,7 +4,7 @@
COMPILER=$1
VERBOSE=$2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-configure.diff b/aqua/qt4-mac/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0c8d0a5..10301ed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2015-05-07 10:14:56.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2015-05-30 14:45:11.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span> @@ -925,12 +925,14 @@
CFG_ICU=auto
CFG_SYSTEM_PROXIES=no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-cxx11.diff b/aqua/qt4-mac/files/patch-cxx11.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 83a2f7d..64f5dbc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/kernel/qcursor_mac.mm.orig 2013-01-22 16:04:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/kernel/qcursor_mac.mm 2013-01-22 16:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/kernel/qcursor_mac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/kernel/qcursor_mac.mm
</span> @@ -367,7 +367,7 @@
type = QCursorData::TYPE_ImageCursor;
curs.cp.my_cursor = true;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,8 +18,8 @@
</span> NSImage *nsimage;
nsimage = static_cast<NSImage *>(qt_mac_create_nsimage(pixmap));
curs.cp.nscursor = [[NSCursor alloc] initWithImage:nsimage hotSpot: hotSpot];
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/kernel/qcocoaview_mac.mm.orig 2013-01-22 16:04:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/kernel/qcocoaview_mac.mm 2013-01-22 16:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/kernel/qcocoaview_mac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/kernel/qcocoaview_mac.mm
</span> @@ -1352,7 +1352,7 @@
// Save supported actions:
[theView setSupportedActions: qt_mac_mapDropActions(dragPrivate()->possible_actions)];
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,8 +29,8 @@
</span> NSSize mouseOffset = {0.0, 0.0};
NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard];
dragPrivate()->executed_action = Qt::ActionMask;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/kernel/qt_cocoa_helpers_mac.mm.orig 2013-01-22 16:04:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/kernel/qt_cocoa_helpers_mac.mm 2013-01-22 16:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/kernel/qt_cocoa_helpers_mac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/kernel/qt_cocoa_helpers_mac.mm
</span> @@ -459,17 +459,17 @@
{
NSEvent *proximityEvent = static_cast<NSEvent *>(tabletEvent);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,8 +59,8 @@
</span> qt_dispatchTabletProximityEvent(carbonProximityRec);
}
#endif // QT_MAC_USE_COCOA
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/accessible/qaccessible_mac.mm.orig 2013-01-22 16:04:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/accessible/qaccessible_mac.mm 2013-01-22 16:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/accessible/qaccessible_mac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/accessible/qaccessible_mac.mm
</span> @@ -266,129 +266,129 @@
int qt;
QAXRoleType mac;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -232,8 +232,8 @@
</span> };
class QAInterface;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/styles/qmacstyle_mac.mm.orig 2013-01-22 19:50:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/styles/qmacstyle_mac.mm 2013-01-22 19:55:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/styles/qmacstyle_mac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/styles/qmacstyle_mac.mm
</span> @@ -3466,8 +3466,8 @@
tti.version = qt_mac_hitheme_version;
tti.state = tds;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -278,8 +278,8 @@
</span> CGContextSetFillColorSpace(cg, QCoreGraphicsPaintEngine::macGenericColorSpace());
CGContextSetFillColor(cg, colorComp);
tti.fontID = checkable ? kThemeSystemFont : kThemeSmallSystemFont;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/text/qtextdocument_p.cpp.orig 2013-01-22 16:04:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/text/qtextdocument_p.cpp 2013-01-22 16:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/text/qtextdocument_p.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/text/qtextdocument_p.cpp
</span> @@ -63,7 +63,15 @@
// The VxWorks DIAB compiler crashes when initializing the anonymouse union with { a7 }
#if !defined(Q_CC_DIAB)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -297,8 +297,8 @@
</span> #else
# define QT_INIT_TEXTUNDOCOMMAND(c, a1, a2, a3, a4, a5, a6, a7, a8) \
QTextUndoCommand c = { a1, a2, 0, 0, a3, a4, a5, a6 }; c.blockFormat = a7; c.revision = a8
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/widgets/qdialogbuttonbox.cpp.orig 2013-01-22 16:04:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/widgets/qdialogbuttonbox.cpp 2013-01-22 16:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/widgets/qdialogbuttonbox.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/widgets/qdialogbuttonbox.cpp
</span> @@ -212,7 +212,7 @@
return QDialogButtonBox::InvalidRole;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -326,8 +326,8 @@
</span> bool reverse = (*currentLayout & Reverse);
switch (role) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/qt3support/other/q3dragobject.cpp.orig 2013-01-22 16:04:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/qt3support/other/q3dragobject.cpp 2013-01-22 16:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/qt3support/other/q3dragobject.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/qt3support/other/q3dragobject.cpp
</span> @@ -1495,9 +1495,9 @@
void Q3ColorDrag::setColor(const QColor &col)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -341,8 +341,8 @@
</span>
// make sure we transmit data in network order
r = htons(r);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/openvg/qpaintengine_vg.cpp.orig 2013-01-22 16:04:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/openvg/qpaintengine_vg.cpp 2013-01-22 16:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/openvg/qpaintengine_vg.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/openvg/qpaintengine_vg.cpp
</span> @@ -971,23 +971,23 @@
yRadius = qMin(yRadius, rect.height() / 2);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -393,8 +393,8 @@
</span> 0.0f, 0.0f, 0.0f, 0.0f
};
VGImage tileWithOpacity = VG_INVALID_HANDLE;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/openvg/qpixmapdata_vg.cpp.orig 2013-01-22 16:04:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/openvg/qpixmapdata_vg.cpp 2013-01-22 16:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/openvg/qpixmapdata_vg.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/openvg/qpixmapdata_vg.cpp
</span> @@ -421,7 +421,7 @@
1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -404,8 +404,8 @@
</span> 0.0f, 0.0f, 0.0f, 0.0f
};
vgColorMatrix(vgImageOpacity, vgImage, matrix);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.h.orig 2013-01-22 16:04:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2013-01-22 16:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.h
</span> @@ -176,7 +176,7 @@
// Node::emitCode assumes that dst, if provided, is either a local or a referenced temporary.
ASSERT(!dst || dst == ignoredResult() || !dst->isTemporary() || dst->refCount());
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -424,8 +424,8 @@
</span> m_codeBlock->addLineInfo(info);
}
if (m_emitNodeDepth >= s_maxEmitNodeDepth)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp.orig 2013-01-22 16:04:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2013-01-22 16:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
</span> @@ -1835,7 +1835,7 @@
RegisterID* BytecodeGenerator::emitCatch(RegisterID* targetRegister, Label* start, Label* end)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -444,8 +444,8 @@
</span> switch (type) {
case SwitchInfo::SwitchImmediate:
emitOpcode(op_switch_imm);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/javascriptcore/JavaScriptCore/runtime/Identifier.cpp.orig 2013-01-22 16:04:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/javascriptcore/JavaScriptCore/runtime/Identifier.cpp 2013-01-22 16:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/javascriptcore/JavaScriptCore/runtime/Identifier.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/javascriptcore/JavaScriptCore/runtime/Identifier.cpp
</span> @@ -195,7 +195,7 @@
UString::Rep::empty().hash();
return &UString::Rep::empty();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -455,8 +455,8 @@
</span> pair<HashSet<UString::Rep*>::iterator, bool> addResult = globalData->identifierTable->add<UCharBuffer, UCharBufferTranslator>(buf);
// If the string is newly-translated, then we need to adopt it.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSONObject.cpp.orig 2014-05-01 10:03:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSONObject.cpp 2014-05-01 10:06:59.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSONObject.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSONObject.cpp
</span> @@ -320,7 +320,7 @@
default:
static const char hexDigits[] = "0123456789abcdef";
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -466,8 +466,8 @@
</span> builder.append(hex, sizeof(hex) / sizeof(UChar));
break;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h.orig 2014-04-10 14:37:11.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h 2014-05-01 10:22:02.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h
</span> @@ -31,16 +31,22 @@
// nullptr_t type and nullptr object. They are defined in the same namespaces they
// would be in compiler and library that had the support.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -495,8 +495,8 @@
</span> namespace std {
class nullptr_t { };
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/AtomicString.cpp.orig 2013-01-22 16:04:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/AtomicString.cpp 2013-01-22 16:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/AtomicString.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/AtomicString.cpp
</span> @@ -301,7 +301,7 @@
if (!length)
return StringImpl::empty();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -506,8 +506,8 @@
</span> return addToStringTable<UCharBuffer, UCharBufferTranslator>(buffer);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/webkit/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp.orig 2013-01-22 16:04:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/webkit/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2013-01-22 16:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
</span> @@ -2058,7 +2058,7 @@
{
m_usesExceptions = true;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -526,8 +526,8 @@
</span> switch (type) {
case SwitchInfo::SwitchImmediate:
emitOpcode(op_switch_imm);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/webkit/Source/JavaScriptCore/runtime/Identifier.cpp.orig 2013-01-22 16:04:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/webkit/Source/JavaScriptCore/runtime/Identifier.cpp 2013-01-22 16:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/JavaScriptCore/runtime/Identifier.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/JavaScriptCore/runtime/Identifier.cpp
</span> @@ -222,7 +222,7 @@
}
if (!length)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -537,8 +537,8 @@
</span> pair<HashSet<StringImpl*>::iterator, bool> addResult = globalData->identifierTable->add<UCharBuffer, IdentifierUCharBufferTranslator>(buf);
// If the string is newly-translated, then we need to adopt it.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/webkit/Source/JavaScriptCore/runtime/StringPrototype.cpp.orig 2013-01-22 16:04:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/webkit/Source/JavaScriptCore/runtime/StringPrototype.cpp 2013-01-22 16:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/JavaScriptCore/runtime/StringPrototype.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/JavaScriptCore/runtime/StringPrototype.cpp
</span> @@ -463,7 +463,7 @@
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -548,8 +548,8 @@
</span> return JSValue::encode(jsString(exec, source.substringSharingImpl(0, matchPos), substituteBackreferences(replacementString, source, ovector, 0), source.substringSharingImpl(matchEnd)));
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSONObject.cpp.orig 2014-05-01 10:33:20.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSONObject.cpp 2014-05-01 10:34:03.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSONObject.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSONObject.cpp
</span> @@ -335,7 +335,7 @@
default:
static const char hexDigits[] = "0123456789abcdef";
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -559,8 +559,8 @@
</span> builder.append(hex, WTF_ARRAY_LENGTH(hex));
break;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/webkit/Source/WebCore/dom/DocumentMarkerController.cpp.orig 2013-01-22 16:04:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/webkit/Source/WebCore/dom/DocumentMarkerController.cpp 2013-01-22 16:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/dom/DocumentMarkerController.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/dom/DocumentMarkerController.cpp
</span> @@ -59,7 +59,7 @@
for (TextIterator markedText(range); !markedText.atEnd(); markedText.advance()) {
RefPtr<Range> textPiece = markedText.range();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -570,8 +570,8 @@
</span> addMarker(textPiece->startContainer(exception), marker);
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/webkit/Source/WebCore/dom/Element.cpp.orig 2014-05-01 10:46:05.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/webkit/Source/WebCore/dom/Element.cpp 2014-05-01 10:52:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/dom/Element.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
</span> @@ -1080,7 +1080,7 @@
{
// Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -581,8 +581,8 @@
</span> bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules();
bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules();
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/accessible/widgets/itemviews.cpp.orig 2014-05-01 12:08:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/accessible/widgets/itemviews.cpp 2014-05-01 12:28:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/accessible/widgets/itemviews.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/accessible/widgets/itemviews.cpp
</span> @@ -393,7 +393,7 @@
QModelIndex index = view()->model()->index(0, column, view()->rootIndex());
if (!index.isValid() || view()->selectionMode() & QAbstractItemView::NoSelection)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-darwin-g++.diff b/aqua/qt4-mac/files/patch-darwin-g++.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 44a92cc..66bcd68 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-darwin-g++.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-darwin-g++.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure_orig 2010-10-13 21:13:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2010-10-13 21:15:36.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure_orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span> @@ -4558,7 +4558,7 @@
EXTRA_LFLAGS="\$(QMAKE_LFLAGS_RPATH)\"$rpath\" $EXTRA_LFLAGS"
done
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-mkspecs_common_g++-base.conf.diff b/aqua/qt4-mac/files/patch-mkspecs_common_g++-base.conf.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fb1748b..c67cb4a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-mkspecs_common_g++-base.conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-mkspecs_common_g++-base.conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/common/g++-base.conf.orig 2013-01-22 16:04:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/common/g++-base.conf 2013-01-23 20:54:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/g++-base.conf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/g++-base.conf
</span> @@ -8,14 +8,14 @@
# you can use the manual test in tests/manual/mkspecs.
#
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-mkspecs_common_g++-macx.conf.diff b/aqua/qt4-mac/files/patch-mkspecs_common_g++-macx.conf.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fd5dd31..4f316c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-mkspecs_common_g++-macx.conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-mkspecs_common_g++-macx.conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/common/g++-macx.conf.orig 2013-01-22 16:04:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/common/g++-macx.conf 2013-01-23 20:55:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/g++-macx.conf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/g++-macx.conf
</span> @@ -16,16 +16,20 @@
QMAKE_LFLAGS_STATIC_LIB += -all_load
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-mkspecs_common_mac.conf.diff b/aqua/qt4-mac/files/patch-mkspecs_common_mac.conf.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bb53f11..8a11733 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-mkspecs_common_mac.conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-mkspecs_common_mac.conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/common/mac.conf.orig 2012-08-14 15:49:12.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/common/mac.conf 2012-08-14 15:49:25.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/mac.conf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/mac.conf
</span> @@ -9,6 +9,7 @@
QMAKE_LIBDIR =
QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-mkspecs_darwin-g++_qmake.conf.diff b/aqua/qt4-mac/files/patch-mkspecs_darwin-g++_qmake.conf.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d8828a5..6867167 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-mkspecs_darwin-g++_qmake.conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-mkspecs_darwin-g++_qmake.conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/darwin-g++/qmake.conf.orig 2010-10-04 16:26:47.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/darwin-g++/qmake.conf 2010-10-04 16:59:03.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/darwin-g++/qmake.conf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/darwin-g++/qmake.conf
</span> @@ -1,21 +1,22 @@
#
# qmake configuration for darwin-g++
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-mkspecs_features_moc.prf.diff b/aqua/qt4-mac/files/patch-mkspecs_features_moc.prf.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 69620a3..ccebe10 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-mkspecs_features_moc.prf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-mkspecs_features_moc.prf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/moc.prf.orig 2012-04-24 08:27:50.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/moc.prf 2012-04-24 08:27:55.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/moc.prf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/moc.prf
</span> @@ -83,8 +83,13 @@
#make sure we can include these files
moc_dir_short = $$MOC_DIR
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-mkspecs_features_qt.prf.diff b/aqua/qt4-mac/files/patch-mkspecs_features_qt.prf.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index eee91d7..f2c40a4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-mkspecs_features_qt.prf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-mkspecs_features_qt.prf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/qt.prf.orig 2013-07-06 14:28:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/qt.prf 2013-07-06 14:28:33.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/qt.prf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/qt.prf
</span> @@ -145,7 +145,15 @@
#specific module settings
!isEmpty(QT_BUILD_TREE):QMAKE_LIBDIR = $$QT_BUILD_TREE/lib $$QMAKE_LIBDIR #as above, prepending prevents us from picking up "stale" libs
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-mkspecs_features_qt_functions.prf.diff b/aqua/qt4-mac/files/patch-mkspecs_features_qt_functions.prf.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0185498..e1b5ab2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-mkspecs_features_qt_functions.prf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-mkspecs_features_qt_functions.prf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/qt_functions.prf.orig 2013-02-11 08:39:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/qt_functions.prf 2013-02-12 10:57:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/qt_functions.prf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/qt_functions.prf
</span> @@ -16,35 +16,108 @@
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-mkspecs_features_uitools.prf.diff b/aqua/qt4-mac/files/patch-mkspecs_features_uitools.prf.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 05f8a70..28855bc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-mkspecs_features_uitools.prf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-mkspecs_features_uitools.prf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/uitools.prf.orig 2012-04-26 11:40:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/uitools.prf 2012-04-26 11:42:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/uitools.prf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/uitools.prf
</span> @@ -2,13 +2,21 @@
qt:load(qt)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-mkspecs_macx-g++_qmake.conf.diff b/aqua/qt4-mac/files/patch-mkspecs_macx-g++_qmake.conf.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3bc4275..f05afa9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-mkspecs_macx-g++_qmake.conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-mkspecs_macx-g++_qmake.conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/macx-g++/qmake.conf.orig 2012-04-23 14:49:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/macx-g++/qmake.conf 2012-04-17 14:38:16.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/macx-g++/qmake.conf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/macx-g++/qmake.conf
</span> @@ -9,7 +9,7 @@
MAKEFILE_GENERATOR = UNIX
TARGET_PLATFORM = macx
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-mkspecs_objective_cxx.diff b/aqua/qt4-mac/files/patch-mkspecs_objective_cxx.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3f27a78..288c57f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-mkspecs_objective_cxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-mkspecs_objective_cxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/common/gcc-base-macx.conf.orig 2013-01-24 08:20:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/common/gcc-base-macx.conf 2013-01-24 08:25:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/gcc-base-macx.conf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/gcc-base-macx.conf
</span> @@ -29,12 +29,23 @@
QMAKE_OBJECTIVE_CFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
QMAKE_OBJECTIVE_CFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,8 +25,8 @@
</span> QMAKE_LFLAGS_X86 += $$QMAKE_CFLAGS_X86
QMAKE_LFLAGS_X86_64 += $$QMAKE_CFLAGS_X86_64
QMAKE_LFLAGS_PPC += $$QMAKE_CFLAGS_PPC
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/debug.prf.orig 2013-01-24 08:20:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/debug.prf 2013-01-24 08:25:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/debug.prf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/debug.prf
</span> @@ -3,6 +3,7 @@
QMAKE_CFLAGS += $$QMAKE_CFLAGS_DEBUG
QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_DEBUG
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,8 +35,8 @@
</span> QMAKE_LFLAGS += $$QMAKE_LFLAGS_DEBUG
QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_DEBUG
!debug_and_release:fix_output_dirs:fixExclusiveOutputDirs(debug, release)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/mac/default_post.prf.orig 2013-01-24 08:20:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/mac/default_post.prf 2013-01-24 08:25:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/mac/default_post.prf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/mac/default_post.prf
</span> @@ -1,5 +1,5 @@
load(default_post)
-!no_objective_c:CONFIG += objective_c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,8 +44,8 @@
</span>
# Pick a suitable default architecture for qmake-based applications.
# If the Qt package contains one of x86 and x86_64, pick that one. If it
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/mac/objective_c.prf.orig 2013-01-24 08:20:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/mac/objective_c.prf 2013-01-24 09:48:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/mac/objective_c.prf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/mac/objective_c.prf
</span> @@ -1,23 +1,18 @@
-
-for(source, SOURCES) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,8 +76,8 @@
</span> objective_c.name = Compile ${QMAKE_FILE_IN}
silent:objective_c.commands = @echo objective-c ${QMAKE_FILE_IN} && $$objective_c.commands
QMAKE_EXTRA_COMPILERS += objective_c
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/mac/ppc.prf.orig 2013-01-24 08:20:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/mac/ppc.prf 2013-01-24 08:25:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/mac/ppc.prf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/mac/ppc.prf
</span> @@ -2,6 +2,7 @@
} else {
QMAKE_CFLAGS += $$QMAKE_CFLAGS_PPC
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,8 +86,8 @@
</span> QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_PPC
QMAKE_LFLAGS += $$QMAKE_LFLAGS_PPC
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/mac/ppc64.prf.orig 2013-01-24 08:20:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/mac/ppc64.prf 2013-01-24 08:25:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/mac/ppc64.prf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/mac/ppc64.prf
</span> @@ -2,6 +2,7 @@
} else {
QMAKE_CFLAGS += $$QMAKE_CFLAGS_PPC_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,8 +96,8 @@
</span> QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_PPC_64
QMAKE_LFLAGS += $$QMAKE_LFLAGS_PPC_64
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/mac/sdk.prf.orig 2013-01-24 08:20:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/mac/sdk.prf 2013-01-24 08:25:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/mac/sdk.prf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/mac/sdk.prf
</span> @@ -2,6 +2,7 @@
!macx-xcode:!macx-pbuilder {
QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,8 +106,8 @@
</span> QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK
QMAKE_LFLAGS += -Wl,-syslibroot,$$QMAKE_MAC_SDK
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/mac/x86.prf.orig 2013-01-24 08:20:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/mac/x86.prf 2013-01-24 08:25:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/mac/x86.prf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/mac/x86.prf
</span> @@ -2,6 +2,7 @@
} else {
QMAKE_CFLAGS += $$QMAKE_CFLAGS_X86
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,8 +116,8 @@
</span> QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_X86
QMAKE_LFLAGS += $$QMAKE_LFLAGS_X86
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/mac/x86_64.prf.orig 2013-01-24 08:20:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/mac/x86_64.prf 2013-01-24 08:25:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/mac/x86_64.prf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/mac/x86_64.prf
</span> @@ -2,6 +2,7 @@
} else {
QMAKE_CFLAGS += $$QMAKE_CFLAGS_X86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,8 +126,8 @@
</span> QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_X86_64
QMAKE_LFLAGS += $$QMAKE_LFLAGS_X86_64
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/release.prf.orig 2013-01-24 08:20:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/release.prf 2013-01-24 08:25:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/release.prf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/release.prf
</span> @@ -2,6 +2,7 @@
QMAKE_CFLAGS += $$QMAKE_CFLAGS_RELEASE
QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_RELEASE
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,16 +138,16 @@
</span> -!debug_and_release:fix_output_dirs:fixExclusiveOutputDirs(release, debug)
\ No newline at end of file
+!debug_and_release:fix_output_dirs:fixExclusiveOutputDirs(release, debug)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/unix/hide_symbols.prf.orig 2013-01-24 08:20:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/unix/hide_symbols.prf 2013-01-24 08:25:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/unix/hide_symbols.prf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/unix/hide_symbols.prf
</span> @@ -1,4 +1,5 @@
QMAKE_CFLAGS += $$QMAKE_CFLAGS_HIDESYMS
QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_HIDESYMS
QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS_HIDESYMS
+QMAKE_OBJECTIVE_CXXFLAGS += $$QMAKE_OBJECTIVE_CXXFLAGS_HIDESYMS
QMAKE_LFLAGS += $$QMAKE_LFLAGS_HIDESYMS
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/warn_off.prf.orig 2013-01-24 08:20:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/warn_off.prf 2013-01-24 08:25:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/warn_off.prf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/warn_off.prf
</span> @@ -1,4 +1,5 @@
CONFIG -= warn_on
QMAKE_CFLAGS += $$QMAKE_CFLAGS_WARN_OFF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,8 +156,8 @@
</span> \ No newline at end of file
+QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS_WARN_OFF
+QMAKE_OBJECTIVE_CXXFLAGS += $$QMAKE_OBJECTIVE_CXXFLAGS_WARN_OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/warn_on.prf.orig 2013-01-24 08:20:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/warn_on.prf 2013-01-24 08:25:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/warn_on.prf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/warn_on.prf
</span> @@ -2,4 +2,4 @@
QMAKE_CFLAGS += $$QMAKE_CFLAGS_WARN_ON
QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_WARN_ON
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-qmake_option.h.diff b/aqua/qt4-mac/files/patch-qmake_option.h.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b8e49f8..a738e59 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-qmake_option.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-qmake_option.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- qmake/option.h.orig 2012-04-23 14:49:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ qmake/option.h 2012-04-20 23:03:15.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qmake/option.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qmake/option.h
</span> @@ -214,6 +214,7 @@
DocumentationPath,
HeadersPath,
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-qmake_project.cpp.diff b/aqua/qt4-mac/files/patch-qmake_project.cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5f8a4e6..41e0452 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-qmake_project.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-qmake_project.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- qmake/project.cpp.orig 2012-04-23 14:49:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ qmake/project.cpp 2012-04-17 14:38:16.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qmake/project.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qmake/project.cpp
</span> @@ -596,14 +596,17 @@
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-qmake_property.cpp.diff b/aqua/qt4-mac/files/patch-qmake_property.cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e8e87eb..912003c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-qmake_property.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-qmake_property.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- qmake/property.cpp.orig 2012-04-23 14:49:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ qmake/property.cpp 2012-04-20 22:56:47.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qmake/property.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qmake/property.cpp
</span> @@ -91,6 +91,8 @@
return QLibraryInfo::location(QLibraryInfo::HeadersPath);
else if(v == "QT_INSTALL_LIBS")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-qmake_qmake.pri.diff b/aqua/qt4-mac/files/patch-qmake_qmake.pri.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b868b90..883841b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-qmake_qmake.pri.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-qmake_qmake.pri.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- qmake/qmake.pri.orig 2014-04-10 14:37:13.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ qmake/qmake.pri 2014-05-01 08:39:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qmake/qmake.pri.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qmake/qmake.pri
</span> @@ -135,7 +135,7 @@
SOURCES += qfilesystemengine_unix.cpp qfilesystemiterator_unix.cpp qfsfileengine_unix.cpp
mac {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_plugins_PluginView.h.diff b/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_plugins_PluginView.h.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 138f429..bac79dd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_plugins_PluginView.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_plugins_PluginView.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/webkit/Source/WebCore/plugins/PluginView.h.orig 2012-04-23 14:49:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/webkit/Source/WebCore/plugins/PluginView.h 2012-04-23 14:51:28.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/plugins/PluginView.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/plugins/PluginView.h
</span> @@ -411,7 +411,9 @@
Point m_lastMousePos;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_plugins_mac_PluginViewMac.mm.diff b/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_plugins_mac_PluginViewMac.mm.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d7df5f2..a37f30b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_plugins_mac_PluginViewMac.mm.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebCore_plugins_mac_PluginViewMac.mm.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginViewMac.mm.orig 2012-04-23 14:49:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginViewMac.mm 2012-04-23 14:51:28.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginViewMac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginViewMac.mm
</span> @@ -233,8 +233,10 @@
setNPWindowIfNeeded();
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_corelib_corelib.pro.diff b/aqua/qt4-mac/files/patch-src_corelib_corelib.pro.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b9c3025..ec3afbb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-src_corelib_corelib.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_corelib_corelib.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/corelib/corelib.pro.orig 2012-09-17 15:22:14.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/corelib/corelib.pro 2012-09-17 15:22:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/corelib.pro.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/corelib.pro
</span> @@ -25,7 +25,7 @@
LIBS_PRIVATE += -framework CoreServices -framework Security
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_corelib_global_qlibraryinfo.cpp.diff b/aqua/qt4-mac/files/patch-src_corelib_global_qlibraryinfo.cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0e34fee..b9a62dc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-src_corelib_global_qlibraryinfo.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_corelib_global_qlibraryinfo.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/corelib/global/qlibraryinfo.cpp.orig 2012-04-23 14:49:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/corelib/global/qlibraryinfo.cpp 2012-04-20 22:59:34.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/global/qlibraryinfo.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/global/qlibraryinfo.cpp
</span> @@ -262,6 +262,11 @@
path = QT_CONFIGURE_LIBRARIES_PATH;
break;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_corelib_global_qlibraryinfo.h.diff b/aqua/qt4-mac/files/patch-src_corelib_global_qlibraryinfo.h.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d600213..e242c9b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-src_corelib_global_qlibraryinfo.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_corelib_global_qlibraryinfo.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/corelib/global/qlibraryinfo.h.orig 2012-04-23 14:49:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/corelib/global/qlibraryinfo.h 2012-04-20 22:56:57.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/global/qlibraryinfo.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/global/qlibraryinfo.h
</span> @@ -70,6 +70,7 @@
DocumentationPath,
HeadersPath,
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_corelib_io_qprocess_unix.cpp.diff b/aqua/qt4-mac/files/patch-src_corelib_io_qprocess_unix.cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d9dce5b..ef4a5fb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-src_corelib_io_qprocess_unix.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_corelib_io_qprocess_unix.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/corelib/io/qprocess_unix.cpp.orig 2015-10-14 13:02:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/corelib/io/qprocess_unix.cpp 2015-10-14 13:02:43.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/io/qprocess_unix.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/io/qprocess_unix.cpp
</span> @@ -1302,11 +1302,11 @@
// read a byte from the death pipe
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_corelib_tools_qelapsedtimer-mac.cpp.diff b/aqua/qt4-mac/files/patch-src_corelib_tools_qelapsedtimer-mac.cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5946e86..65a299c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-src_corelib_tools_qelapsedtimer-mac.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_corelib_tools_qelapsedtimer-mac.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/corelib/tools/qelapsedtimer_mac.cpp.orig 2011-09-12 08:49:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/corelib/tools/qelapsedtimer_mac.cpp 2012-02-02 21:30:46.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/tools/qelapsedtimer_mac.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/tools/qelapsedtimer_mac.cpp
</span> @@ -62,7 +62,7 @@
{
if (info.denom == 0)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_gui_dialogs_qfiledialog_mac.mm.diff b/aqua/qt4-mac/files/patch-src_gui_dialogs_qfiledialog_mac.mm.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 31c9562..2c353aa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-src_gui_dialogs_qfiledialog_mac.mm.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_gui_dialogs_qfiledialog_mac.mm.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/dialogs/qfiledialog_mac.mm.orig 2015-05-07 10:14:43.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/dialogs/qfiledialog_mac.mm 2015-10-14 12:02:40.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/dialogs/qfiledialog_mac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/dialogs/qfiledialog_mac.mm
</span> @@ -297,6 +297,7 @@
CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, (CFStringRef)filename, kCFURLPOSIXPathStyle, isDir);
CFBooleanRef isHidden;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_gui_kernel_qmime_mac.cpp.diff b/aqua/qt4-mac/files/patch-src_gui_kernel_qmime_mac.cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0a02c7d..f605e0f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-src_gui_kernel_qmime_mac.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_gui_kernel_qmime_mac.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- .//src/gui/kernel/qmime_mac.cpp.orig 2015-05-07 07:14:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ .//src/gui/kernel/qmime_mac.cpp 2016-10-10 04:12:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- .//src/gui/kernel/qmime_mac.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ .//src/gui/kernel/qmime_mac.cpp
</span> @@ -68,12 +68,6 @@
#include "qmap.h"
#include <private/qt_mac_p.h>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_gui_painting_qpaintengine_mac.diff b/aqua/qt4-mac/files/patch-src_gui_painting_qpaintengine_mac.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fc20d5d..e3f6f32 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-src_gui_painting_qpaintengine_mac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_gui_painting_qpaintengine_mac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/gui/painting/qpaintengine_mac.cpp.orig
+++ src/gui/painting/qpaintengine_mac.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -289,7 +289,7 @@ static CGMutablePathRef qt_mac_compose_path(const QPainterPath &p, float off=0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -289,7 +289,7 @@
</span> }
CGColorSpaceRef QCoreGraphicsPaintEngine::m_genericColorSpace = 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> bool QCoreGraphicsPaintEngine::m_postRoutineRegistered = false;
CGColorSpaceRef QCoreGraphicsPaintEngine::macGenericColorSpace()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -318,48 +318,31 @@ CGColorSpaceRef QCoreGraphicsPaintEngine::macGenericColorSpace()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -318,48 +318,31 @@
</span>
CGColorSpaceRef QCoreGraphicsPaintEngine::macDisplayColorSpace(const QWidget *widget)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,7 +66,7 @@
</span> return colorSpace;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -369,7 +352,7 @@ void QCoreGraphicsPaintEngine::cleanUpMacColorSpaces()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -369,7 +352,7 @@
</span> CFRelease(m_genericColorSpace);
m_genericColorSpace = 0;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +75,7 @@
</span> while (it != m_displayColorSpaceHash.constEnd()) {
if (it.value())
CFRelease(it.value());
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1069,7 +1052,16 @@ void QCoreGraphicsPaintEngine::cleanup()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1069,7 +1052,16 @@
</span>
void QCoreGraphicsPaintEngine::clearColorSpace(QWidget* w)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,7 +95,7 @@
</span> CGContextRef
--- src/gui/painting/qpaintengine_mac_p.h.orig
+++ src/gui/painting/qpaintengine_mac_p.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -135,7 +135,7 @@ protected:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -135,7 +135,7 @@
</span> private:
static bool m_postRoutineRegistered;
static CGColorSpaceRef m_genericColorSpace;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_qbase.pri.diff b/aqua/qt4-mac/files/patch-src_qbase.pri.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d065ce6..c330805 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-src_qbase.pri.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_qbase.pri.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/qbase.pri.orig 2012-04-23 14:49:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/qbase.pri 2012-04-18 22:49:14.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/qbase.pri.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/qbase.pri
</span> @@ -137,14 +137,14 @@
unix|win32-g++*:!symbian {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_qt_install.pri.diff b/aqua/qt4-mac/files/patch-src_qt_install.pri.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 55815ba..a465e4c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-src_qt_install.pri.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_qt_install.pri.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/qt_install.pri.orig 2012-04-23 14:49:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/qt_install.pri 2012-04-20 23:50:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/qt_install.pri.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/qt_install.pri
</span> @@ -3,7 +3,12 @@
dlltarget.path=$$[QT_INSTALL_BINS]
INSTALLS += dlltarget
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_tools_bootstrap_bootstrap.pro.diff b/aqua/qt4-mac/files/patch-src_tools_bootstrap_bootstrap.pro.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8f250f4..61dfdf2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-src_tools_bootstrap_bootstrap.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_tools_bootstrap_bootstrap.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/tools/bootstrap/bootstrap.pro.orig 2015-05-07 10:14:44.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/tools/bootstrap/bootstrap.pro 2015-05-30 13:30:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tools/bootstrap/bootstrap.pro.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tools/bootstrap/bootstrap.pro
</span> @@ -103,7 +103,7 @@
else:win32:SOURCES += ../../corelib/tools/qlocale_win.cpp
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-tools_assistant_lib_fulltextsearch_fulltextsearch.pro.diff b/aqua/qt4-mac/files/patch-tools_assistant_lib_fulltextsearch_fulltextsearch.pro.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b8057c5..c31df53 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-tools_assistant_lib_fulltextsearch_fulltextsearch.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-tools_assistant_lib_fulltextsearch_fulltextsearch.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/assistant/lib/fulltextsearch/fulltextsearch.pro.orig 2012-04-23 14:49:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/assistant/lib/fulltextsearch/fulltextsearch.pro 2012-04-23 12:29:24.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/assistant/lib/fulltextsearch/fulltextsearch.pro.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/assistant/lib/fulltextsearch/fulltextsearch.pro
</span> @@ -6,9 +6,9 @@
mac:!static:contains(QT_CONFIG, qt_framework) {
CONFIG(debug, debug|release) {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-tools_assistant_lib_lib.pro.diff b/aqua/qt4-mac/files/patch-tools_assistant_lib_lib.pro.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9e62ef8..a492204 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-tools_assistant_lib_lib.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-tools_assistant_lib_lib.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/assistant/lib/lib.pro.orig 2012-03-14 10:01:12.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/assistant/lib/lib.pro 2012-04-25 12:32:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/assistant/lib/lib.pro.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/assistant/lib/lib.pro
</span> @@ -12,16 +12,15 @@
application \
framework.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-tools_designer_src_components_lib_lib.pro.diff b/aqua/qt4-mac/files/patch-tools_designer_src_components_lib_lib.pro.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e814560..b615040 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-tools_designer_src_components_lib_lib.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-tools_designer_src_components_lib_lib.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/designer/src/components/lib/lib.pro.orig 2012-04-23 14:49:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/designer/src/components/lib/lib.pro 2012-04-22 14:42:03.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/designer/src/components/lib/lib.pro.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/designer/src/components/lib/lib.pro
</span> @@ -64,12 +64,38 @@
include(../../sharedcomponents.pri)
include(../component.pri)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-tools_designer_src_lib_lib.pro.diff b/aqua/qt4-mac/files/patch-tools_designer_src_lib_lib.pro.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index dbdf210..686a0f1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-tools_designer_src_lib_lib.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-tools_designer_src_lib_lib.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/designer/src/lib/lib.pro.orig 2012-04-23 14:49:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/designer/src/lib/lib.pro 2012-04-22 14:41:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/designer/src/lib/lib.pro.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/designer/src/lib/lib.pro
</span> @@ -13,8 +13,6 @@
VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-tools_designer_src_uitools_uitools.pro.diff b/aqua/qt4-mac/files/patch-tools_designer_src_uitools_uitools.pro.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index debcf74..cabb6ec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-tools_designer_src_uitools_uitools.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-tools_designer_src_uitools_uitools.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/designer/src/uitools/uitools.pro.orig 2012-03-14 10:01:12.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/designer/src/uitools/uitools.pro 2012-04-25 14:57:29.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/designer/src/uitools/uitools.pro.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/designer/src/uitools/uitools.pro
</span> @@ -1,7 +1,7 @@
TEMPLATE = lib
TARGET = QtUiTools
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-tools_macdeployqt_macdeployqt_main.cpp.diff b/aqua/qt4-mac/files/patch-tools_macdeployqt_macdeployqt_main.cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7350ee8..e3fd091 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-tools_macdeployqt_macdeployqt_main.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-tools_macdeployqt_macdeployqt_main.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/macdeployqt/macdeployqt/main.cpp.orig 2012-04-23 14:49:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/macdeployqt/macdeployqt/main.cpp 2012-04-17 14:38:16.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/macdeployqt/macdeployqt/main.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/macdeployqt/macdeployqt/main.cpp
</span> @@ -127,7 +127,7 @@
if (plugins) {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-tools_macdeployqt_shared_shared.cpp.diff b/aqua/qt4-mac/files/patch-tools_macdeployqt_shared_shared.cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6aa620b..e74674c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-tools_macdeployqt_shared_shared.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-tools_macdeployqt_shared_shared.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/macdeployqt/shared/shared.cpp.orig 2012-08-12 19:01:35.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/macdeployqt/shared/shared.cpp 2012-08-12 19:01:55.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/macdeployqt/shared/shared.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/macdeployqt/shared/shared.cpp
</span> @@ -141,7 +141,7 @@
state = DylibName;
continue;
</pre><pre style='margin:0'>
</pre>